Merge branch 'master' of https://bitbucket.org/jonathanquispe/processmaker

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, '');
     }
   }
 }

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);
         }

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();
     }