fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolving conflicts after merge in develop the features related to Laravel 5.7 and MySQL 5.7

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2019-07-04 10:27:28 -04:00
parent 3793f6f2fd 9304973608
commit 56693bbcb0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/WorkspaceTools.php
View File

@@ -283,6 +283,7 @@ class WorkspaceTools
$this->upgradeContent($workspace);
CLI::logging("* End to update CONTENT table... (Completed on " . (microtime(true) - $start) . " seconds)\n");
CLI::logging("* Start to update CONTENT table...\n");
$start = microtime(true);
CLI::logging("* Start to migrate texts/values from 'CONTENT' table to the corresponding object tables...\n");
$this->migrateContent($lang);
@@ -2152,7 +2153,6 @@ class WorkspaceTools
$workspace->upgradeSchema($systemSchema);
CLI::logging("* End adding/replenishing all indexes...(Completed on " . (microtime(true) - $start) . " seconds)\n");
/*----------------------------------********---------------------------------*/
CLI::logging("* Start migrating to new list tables...\n");
$start = microtime(true);
$workspace->migrateList(true, $lang);