Index: branches/5.2.x/core/units/priorites/priority_eh.php =================================================================== diff -u -N -r15262 -r16513 --- branches/5.2.x/core/units/priorites/priority_eh.php (.../priority_eh.php) (revision 15262) +++ branches/5.2.x/core/units/priorites/priority_eh.php (.../priority_eh.php) (revision 16513) @@ -1,6 +1,6 @@ Application->getUnitOption($event->Prefix, 'ProcessPrefixes', Array ()); - /* @var $prefixes Array */ foreach ($prefixes as $prefix) { foreach ($hooks as $hook) { @@ -165,8 +165,8 @@ return ; } + /** @var kPriorityHelper $priority_helper */ $priority_helper = $this->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( array('prefix'=>$del_info['prefix'], 'name'=>'Dummy' ) ); @@ -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); @@ -281,8 +281,8 @@ { $obj = $event->MasterEvent->getObject(); if ($obj->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); @@ -314,8 +314,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); @@ -366,8 +366,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');