Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

This commit is contained in:
Dante
2015-04-20 10:56:37 -04:00
5 changed files with 17 additions and 17 deletions

View File

@@ -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