Index: branches/5.3.x/core/units/priorites/priority_eh.php =================================================================== diff -u -N -r16222 -r16519 --- branches/5.3.x/core/units/priorites/priority_eh.php (.../priority_eh.php) (revision 16222) +++ branches/5.3.x/core/units/priorites/priority_eh.php (.../priority_eh.php) (revision 16519) @@ -1,6 +1,6 @@ Application->recallObject('PriorityHelper'); - /* @var $priority_helper kPriorityHelper */ list ($constrain, $joins) = $this->getConstrainInfo($event); $is_new = $event->MasterEvent->Name == 'OnPreCreate' || $event->MasterEvent->Name == 'OnPreSaveCreated'; @@ -241,8 +241,8 @@ $del = $this->Application->RecallVar('priority_deleted'.$this->Application->GetVar('m_wid')); $del = $del ? unserialize($del) : array(); + /** @var kPriorityHelper $priority_helper */ $priority_helper = $this->Application->recallObject('PriorityHelper'); - /* @var $priority_helper kPriorityHelper */ foreach ($del as $del_info) { $dummy_event = new kEvent($del_info['prefix'] . ':OnDummy'); @@ -266,8 +266,8 @@ $tmp = $this->Application->RecallVar('priority_changes'.$this->Application->GetVar('m_wid')); $changes = $tmp ? unserialize($tmp) : array(); + /** @var kPriorityHelper $priority_helper */ $priority_helper = $this->Application->recallObject('PriorityHelper'); - /* @var $priority_helper kPriorityHelper */ list ($constrain, $joins) = $this->getConstrainInfo($event); $ids = $priority_helper->updatePriorities($event->MasterEvent, $changes, Array (0 => $event->MasterEvent->getEventParam('ids')), $constrain, $joins); @@ -283,8 +283,8 @@ /* @var $object kDBItem */ if ($object->GetDBField('Priority') == 0) { + /** @var kPriorityHelper $priority_helper */ $priority_helper = $this->Application->recallObject('PriorityHelper'); - /* @var $priority_helper kPriorityHelper */ list ($constrain, $joins) = $this->getConstrainInfo($event); $priority_helper->preparePriorities($event->MasterEvent, true, $constrain, $joins); @@ -317,8 +317,8 @@ WHERE '.$id_field.' IN ('.implode(',', $ids).') ORDER BY Priority DESC'; $priorities = $this->Conn->GetCol($sql, $id_field); + /** @var kPriorityHelper $priority_helper */ $priority_helper = $this->Application->recallObject('PriorityHelper'); - /* @var $priority_helper kPriorityHelper */ list ($constrain, $joins) = $this->getConstrainInfo($event); @@ -369,8 +369,8 @@ */ function OnRecalculatePriorities($event) { + /** @var kPriorityHelper $priority_helper */ $priority_helper = $this->Application->recallObject('PriorityHelper'); - /* @var $priority_helper kPriorityHelper */ $prefix = $this->Application->GetVar('priority_prefix'); $dummy_event = new kEvent($prefix . ':Dummy');