diff --git a/module/execution/model.php b/module/execution/model.php index cf9aa0fcda..3c7982cf13 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1806,7 +1806,7 @@ class executionModel extends model { $executionID = (int)$executionID; $path = ''; - if($type != 'child') $path = $this->dao->select('id,parent,path')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('path'); + if($type != 'child') $path = $this->dao->select('path')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('path'); return $this->dao->select('*')->from(TABLE_EXECUTION) ->where('deleted')->eq(0) ->beginIF($type == 'child')->andWhere('parent')->eq($executionID)->fi() diff --git a/module/programplan/zen.php b/module/programplan/zen.php index bfd5ef59b9..ce8d144b25 100644 --- a/module/programplan/zen.php +++ b/module/programplan/zen.php @@ -480,7 +480,7 @@ class programplanZen extends programplan $sortedPlans = array(); foreach($plans as $plan) { - if($sortedPlans[$plan->id]) continue; + if(isset($sortedPlans[$plan->id])) continue; $sortedPlans[$plan->id] = $plan; $children = $getChildren($plan->id);