Index: branches/5.2.x/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -N -r15130 -r15137 --- branches/5.2.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 15137) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBItem */ - $target_object =& $this->Application->recallObject($event->Special); + $target_object = $this->Application->recallObject($event->Special); /* @var $target_object kDBList */ $object->SetDBField('Recipients', $target_object->GetDBField($mapping[$event->Special])); @@ -285,7 +285,7 @@ $email = $user_info['Email']; $name = trim($user_info['FirstName'] . ' ' . $user_info['LastName']); - $user =& $this->Application->recallObject('u.email-from', null, Array('skip_autoload' => true)); + $user = $this->Application->recallObject('u.email-from', null, Array('skip_autoload' => true)); /* @var $user UsersItem */ $user->Load($user_info['PortalUserId']); @@ -316,7 +316,7 @@ $name = strip_tags( $this->Application->ConfigValue('Site_Name') ); } - $esender =& $this->Application->recallObject('EmailSender'); + $esender = $this->Application->recallObject('EmailSender'); /* @var $esender kEmailSendingHelper */ $esender->SetFrom($email, $name); @@ -378,7 +378,7 @@ array_unshift($all_recipients[EmailEvent::RECIPIENT_TYPE_TO], $add_recipient); - $user =& $this->Application->recallObject('u.email-to', null, Array('skip_autoload' => true)); + $user = $this->Application->recallObject('u.email-to', null, Array('skip_autoload' => true)); /* @var $user UsersItem */ $user->Load($to_user_id); @@ -411,7 +411,7 @@ $this->_addDefaultRecipient($all_recipients); } - $esender =& $this->Application->recallObject('EmailSender'); + $esender = $this->Application->recallObject('EmailSender'); /* @var $esender kEmailSendingHelper */ $header_mapping = Array ( @@ -530,7 +530,7 @@ return false; } - $minput_helper =& $this->Application->recallObject('MInputHelper'); + $minput_helper = $this->Application->recallObject('MInputHelper'); /* @var $minput_helper MInputHelper */ // group recipients by type @@ -618,7 +618,7 @@ $fields_hash['Body'] = $body; - $email_message_helper =& $this->Application->recallObject('EmailMessageHelper'); + $email_message_helper = $this->Application->recallObject('EmailMessageHelper'); /* @var $email_message_helper EmailMessageHelper */ $ret = $email_message_helper->buildTemplate($fields_hash); @@ -659,7 +659,7 @@ } if ($message_type == 'text') { - $esender =& $this->Application->recallObject('EmailSender'); + $esender = $this->Application->recallObject('EmailSender'); /* @var $esender kEmailSendingHelper */ $footer = $esender->ConvertToText($footer); @@ -702,7 +702,7 @@ $message_headers = Array (); list($headers, $message_body) = explode('&|&', $message, 2); - $category_helper =& $this->Application->recallObject('CategoryHelper'); + $category_helper = $this->Application->recallObject('CategoryHelper'); /* @var $category_helper CategoryHelper */ $message_body = $category_helper->replacePageIds($message_body); @@ -760,7 +760,7 @@ } // 3. set headers & send message - $esender =& $this->Application->recallObject('EmailSender'); + $esender = $this->Application->recallObject('EmailSender'); /* @var $esender kEmailSendingHelper */ $message_subject = isset($message_headers['Subject']) ? $message_headers['Subject'] : 'Mail message'; @@ -828,7 +828,7 @@ $this->Application->SetVar('m_lang', $language_id); - $language =& $this->Application->recallObject('lang.current'); + $language = $this->Application->recallObject('lang.current'); /* @var $language LanguagesItem */ $language->Load($language_id); @@ -887,7 +887,7 @@ return ; } - $mailing_list_helper =& $this->Application->recallObject('MailingListHelper'); + $mailing_list_helper = $this->Application->recallObject('MailingListHelper'); /* @var $mailing_list_helper MailingListHelper */ $mailing_list_helper->processQueue($messages); @@ -983,7 +983,7 @@ $records[] = Array ('Tag' => $tag, 'Replacement' => $replacement); } - $minput_helper =& $this->Application->recallObject('MInputHelper'); + $minput_helper = $this->Application->recallObject('MInputHelper'); /* @var $minput_helper MInputHelper */ $xml = $minput_helper->prepareMInputXML($records, Array ('Tag', 'Replacement')); @@ -1033,7 +1033,7 @@ // process replacement tags if ( $object->GetDBField('ReplacementTagsXML') ) { - $minput_helper =& $this->Application->recallObject('MInputHelper'); + $minput_helper = $this->Application->recallObject('MInputHelper'); /* @var $minput_helper MInputHelper */ $replacement_tags = Array ();