Index: branches/5.2.x/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -N -r15116 -r15130 --- branches/5.2.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 15116) +++ branches/5.2.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 15130) @@ -1,6 +1,6 @@ Application->GetVar('module'); @@ -86,7 +86,7 @@ * @access protected * @see kDBEventHandler::OnListBuild() */ - protected function SetCustomQuery(kEvent &$event) + protected function SetCustomQuery(kEvent $event) { parent::SetCustomQuery($event); @@ -111,7 +111,7 @@ * @return void * @access protected */ - protected function OnNew(kEvent &$event) + protected function OnNew(kEvent $event) { parent::OnNew($event); @@ -135,7 +135,7 @@ * @return void * @access protected */ - protected function OnPreCreate(kEvent &$event) + protected function OnPreCreate(kEvent $event) { parent::OnPreCreate($event); @@ -150,7 +150,7 @@ * * @param kEvent $event */ - function OnFrontOnly(&$event) + function OnFrontOnly($event) { if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) { $event->status = kEvent::erFAIL; @@ -175,7 +175,7 @@ * @return void * @access protected */ - protected function OnSelectUser(kEvent &$event) + protected function OnSelectUser(kEvent $event) { if ( $event->Special != 'module' ) { parent::OnSelectUser($event); @@ -211,7 +211,7 @@ * * @param kEvent $event */ - function OnSaveSelected(&$event) + function OnSaveSelected($event) { $this->StoreSelectedIDs($event); } @@ -222,7 +222,7 @@ * @param kEvent $event * @return kDBItem */ - function &_getEmailEvent(&$event) + function &_getEmailEvent($event) { $false = false; $name = $event->getEventParam('EmailEventName'); @@ -255,7 +255,7 @@ * @param kEvent $event * @param Array $direct_params */ - function _processSender(&$event, $direct_params = Array ()) + function _processSender($event, $direct_params = Array ()) { $this->Application->removeObject('u.email-from'); @@ -331,7 +331,7 @@ * @param Array $direct_params * @return Array */ - function _processRecipients(&$event, &$direct_params = Array ()) + function _processRecipients($event, &$direct_params = Array ()) { $this->Application->removeObject('u.email-to'); @@ -556,7 +556,7 @@ * @param int $language_id * @return string */ - function _getMessageBody(&$event, $language_id = null) + function _getMessageBody($event, $language_id = null) { if (!isset($language_id)) { $language_id = $this->Application->GetVar('m_lang'); @@ -724,7 +724,7 @@ * @return void * @access protected */ - protected function OnEmailEvent(&$event) + protected function OnEmailEvent($event) { $email_event_name = $event->getEventParam('EmailEventName'); if ( strpos($email_event_name, '_') !== false ) { @@ -845,7 +845,7 @@ * @param kEvent $event * @todo Move to MailingList */ - function OnProcessEmailQueue(&$event) + function OnProcessEmailQueue($event) { $deliver_count = $event->getEventParam('deliver_count'); if ($deliver_count === false) { @@ -912,7 +912,7 @@ * @return void * @access protected */ - protected function OnAfterConfigRead(kEvent &$event) + protected function OnAfterConfigRead(kEvent $event) { parent::OnAfterConfigRead($event); @@ -943,7 +943,7 @@ * @return void * @access protected */ - protected function OnEdit(kEvent &$event) + protected function OnEdit(kEvent $event) { parent::OnEdit($event); @@ -958,7 +958,7 @@ * @return void * @access protected */ - protected function OnAfterItemLoad(kEvent &$event) + protected function OnAfterItemLoad(kEvent $event) { parent::OnAfterItemLoad($event); @@ -995,7 +995,7 @@ * * @param kEvent $event */ - function _itemChanged(&$event) + function _itemChanged($event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -1080,7 +1080,7 @@ * @param kEvent $event * @param string $field_prefix */ - function _validateAddress(&$event, $field_prefix) + function _validateAddress($event, $field_prefix) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -1128,7 +1128,7 @@ * @return void * @access protected */ - protected function OnBeforeItemCreate(kEvent &$event) + protected function OnBeforeItemCreate(kEvent $event) { parent::OnBeforeItemCreate($event); @@ -1142,7 +1142,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(kEvent &$event) + protected function OnBeforeItemUpdate(kEvent $event) { parent::OnBeforeItemUpdate($event); @@ -1154,7 +1154,7 @@ * * @param kEvent $event */ - function OnSuggestAddress(&$event) + function OnSuggestAddress($event) { $event->status = kEvent::erSTOP; @@ -1249,7 +1249,7 @@ * @return void * @access protected */ - protected function OnExportEmailEvents(kEvent &$event) + protected function OnExportEmailEvents(kEvent $event) { if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) { $event->status = kEvent::erFAIL;