Changeset 3060 for sandbox/workflow/trunk/inc/engine/src/common/WfRuntime.php

Timestamp:

07/15/10 17:30:07 (14 years ago)

Author:

viani

Message:

Ticket #950 - Merged 2838:3056 /trunk/workflow em /sandbox/workflow/trunk

File:

• sandbox/workflow/trunk/inc/engine/src/common/WfRuntime.php (modified) (2 diffs)

sandbox/workflow/trunk/inc/engine/src/common/WfRuntime.php

@@ -1089 +1089 @@
     $run_activity = Factory::newInstance('run_activity');
     $run_activity->runtime->instance->parentInstanceId = $this->instance_id;
-    $run_activity->runtime->instance->parentActivityId = $this->activity_id;
     $output = $run_activity->goChildInstance($activityID, $properties, $user, $parentLock);
     $_REQUEST['iid'] = $iid;
@@ -1128 +1127 @@
   function getParent()
   {
-    $resultSet = $this->query("SELECT wf_parent_instance_id, wf_parent_activity_id, wf_parent_lock FROM egw_wf_interinstance_relations WHERE (wf_child_instance_id = ?)", array($this->getInstanceId()));
+    $resultSet = $this->query("SELECT wf_parent_instance_id, wf_parent_lock FROM egw_wf_interinstance_relations WHERE (wf_child_instance_id = ?)", array($this->getInstanceId()));
     if (($row = $resultSet->fetchRow()))
-      return array('instance_id' => $row['wf_parent_instance_id'], 'activity_id' => $row['wf_parent_activity_id'], 'lock' => ($row['wf_parent_lock'] == 1));
+      return array('instance_id' => $row['wf_parent_instance_id'], 'lock' => ($row['wf_parent_lock'] == 1));
     else
       return false;