From 900b8acd37254b1efab3c969275e5115e9315692 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Fri, 8 May 2015 20:11:25 -0400
Subject: [PATCH 1/2] PM-2652 - PM-2461: error whit workspace-restore

---
 workflow/engine/bin/tasks/cliWorkspaces.php | 1 +
 workflow/engine/classes/class.wsTools.php   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/bin/tasks/cliWorkspaces.php b/workflow/engine/bin/tasks/cliWorkspaces.php
index 1f9314fee..5b51f89f4 100755
--- a/workflow/engine/bin/tasks/cliWorkspaces.php
+++ b/workflow/engine/bin/tasks/cliWorkspaces.php
@@ -579,6 +579,7 @@ function run_workspace_restore($args, $opts) {
             return;
         }
         workspaceTools::restore($filename, $workspace, $dstWorkspace, $overwrite, $lang);
+        run_cacheview_upgrade($workspace, '');
     }
   }
 }
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 13b84755d..d7e6d75c7 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1608,12 +1608,12 @@ class workspaceTools
             $final = $stop - $start;
             CLI::logging("<*>   Verify took $final seconds.\n");
 
-            $start = microtime(true);
+            /*$start = microtime(true);
             CLI::logging("> Updating cache view...\n");
             $workspace->upgradeCacheView(true, false, $lang);
             $stop = microtime(true);
             $final = $stop - $start;
-            CLI::logging("<*>   Updating cache view Process took $final seconds.\n");
+            CLI::logging("<*>   Updating cache view Process took $final seconds.\n");*/
 
             mysql_close($link);
         }

From 0dfab586e37c869c2060cc758fb7e60c254b8ea3 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Fri, 8 May 2015 21:32:56 -0400
Subject: [PATCH 2/2] PM-2685: error al importar BPMN con casos

---
 .../engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index cefb56f9f..a771b0488 100755
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -1038,9 +1038,9 @@ class BpmnWorkflow extends Project\Bpmn
         }
     }
 
-    public function remove()
+    public function remove($force = false)
     {
-        parent::remove();
+        parent::remove($force);
         $this->wp->remove();
     }