Merged master into dashboards2

2015-04-17 16:34:25 -04:00
parent 9c81335aba 47d00305ba
commit e1c9b9c325
4 changed files with 16 additions and 17 deletions
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -1384,10 +1384,6 @@ class BpmnWorkflow extends Project\Bpmn

            $activity = $bwp->getActivity($activityData["ACT_UID"]);

-            if ($activity["BOU_CONTAINER"] != $activityData["BOU_CONTAINER"]) {
-                $activity = null;
-            }
-
            if ($forceInsert || is_null($activity)) {
                if ($generateUid) {
                    //Generate and update UID