From 7e82d0e02c8cf87c038b66edd654c62099f6f1eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?=
 <juliocesar@processmaker.com>
Date: Thu, 4 Jul 2019 14:36:40 -0400
Subject: [PATCH] Fix conflicts after merge with develop

---
 workflow/engine/classes/WorkspaceTools.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index adc7d7714..a496b7fb6 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -238,7 +238,6 @@ class WorkspaceTools
      * Upgrade this workspace to the latest system version
      *
      * @param string $workspace
-     * @param bool $onedb
      * @param string $lang
      * @param array $arrayOptTranslation
      * @param array $optionMigrateHistoryData
@@ -283,8 +282,8 @@ class WorkspaceTools
         $this->upgradeContent($workspace);
         CLI::logging("* End to update CONTENT table... (Completed on  " . (microtime(true) - $start) . " seconds)\n");
 
-        $start = microtime(true);
         CLI::logging("* Start to migrate texts/values from 'CONTENT' table to the corresponding object tables...\n");
+        $start = microtime(true);
         $this->migrateContent($lang);
         CLI::logging("* End to migrate texts/values from 'CONTENT' table to the corresponding object tables... (Completed on " .
             (microtime(true) - $start) . " seconds)\n");
@@ -353,12 +352,10 @@ class WorkspaceTools
         $this->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);
         $this->migrateList(true, $lang);
         CLI::logging("* End migrating to new list tables...(Completed on " . (microtime(true) - $start) . " seconds)\n");
-        /*----------------------------------********---------------------------------*/
 
         CLI::logging("* Start updating MySQL triggers...\n");
         $start = microtime(true);
@@ -1053,6 +1050,14 @@ class WorkspaceTools
 
     /**
      * Upgrade the workspace database to the latest system schema
+<<<<<<< HEAD
+=======
+     *
+     * @param bool $onedb Was installed in one DB or not
+     * @param bool $checkOnly Only check if the upgrade is needed if true
+     *
+     * @return bool upgradeSchema
+>>>>>>> PMC-565
      */
     public function upgradeDatabase()
     {