Index: branches/5.2.x/units/private_message_body/private_message_body_eh.php =================================================================== diff -u -N -r15133 -r15140 --- branches/5.2.x/units/private_message_body/private_message_body_eh.php (.../private_message_body_eh.php) (revision 15133) +++ branches/5.2.x/units/private_message_body/private_message_body_eh.php (.../private_message_body_eh.php) (revision 15140) @@ -1,6 +1,6 @@ Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ $options_map = $post_helper->getOptionsMap(); Index: branches/5.2.x/units/private_messages/private_message_eh.php =================================================================== diff -u -N -r15133 -r15140 --- branches/5.2.x/units/private_messages/private_message_eh.php (.../private_message_eh.php) (revision 15133) +++ branches/5.2.x/units/private_messages/private_message_eh.php (.../private_message_eh.php) (revision 15140) @@ -1,6 +1,6 @@ Application->recallObject($event->Prefix . '-body', null, Array ('skip_autoload' => true)); + $message_body = $this->Application->recallObject($event->Prefix . '-body', null, Array ('skip_autoload' => true)); /* @var $message_body kDBItem */ // 1. create message body (for sender & recipient) @@ -152,7 +152,7 @@ $object =& $event->getObject(); /* @var $object kDBItem */ - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ $options_map = $post_helper->getOptionsMap(); @@ -283,7 +283,7 @@ if ( $reply_to > 0 ) { // reply to message - $source_msg =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); + $source_msg = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); /* @var $source_msg kDBItem */ $source_msg->Load($reply_to); Index: branches/5.2.x/units/posts/post_tp.php =================================================================== diff -u -N -r15008 -r15140 --- branches/5.2.x/units/posts/post_tp.php (.../post_tp.php) (revision 15008) +++ branches/5.2.x/units/posts/post_tp.php (.../post_tp.php) (revision 15140) @@ -1,6 +1,6 @@ Application->getUnitOption($this->Prefix, 'ParentPrefix'); - $main_object =& $this->Application->recallObject($parent_prefix); + $main_object = $this->Application->recallObject($parent_prefix); /* @var $main_object kCatDBItem */ if ($main_object->isLoaded()) { @@ -50,7 +50,7 @@ $object =& $this->getObject($params); /* @var $object kDBItem */ - $poster =& $this->Application->recallObject('u.poster', null, Array('skip_autoload' => true)); + $poster = $this->Application->recallObject('u.poster', null, Array('skip_autoload' => true)); /* @var $poster UsersItem */ if ( !isset($posters) ) { @@ -117,7 +117,7 @@ { $object =& $this->getObject($params); - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ return $post_helper->CensorText( $object->GetDBField('Subject') ); @@ -127,7 +127,7 @@ { $object =& $this->getObject($params); - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ $body = $object->GetDBField('PostingText'); @@ -154,7 +154,7 @@ $object =& $this->getObject($params); $post_options = $object->GetDBField('Options'); - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ // show poster signature in this post @@ -181,7 +181,7 @@ { $object =& $this->getObject($params); - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ $sub_blocks = Array ( @@ -254,11 +254,11 @@ if (!isset($category_path)) { // get topic category $parent_prefix = $this->Application->getUnitOption($this->Prefix, 'ParentPrefix'); - $parent_item =& $this->Application->recallObject($parent_prefix, null, Array ('raise_warnings' => 0)); + $parent_item = $this->Application->recallObject($parent_prefix, null, Array ('raise_warnings' => 0)); $category_path = $parent_item->isLoaded() ? $parent_item->GetDBField('ParentPath') : $this->Application->GetVar('m_cat_id'); } - $perm_helper =& $this->Application->recallObject('PermissionsHelper'); + $perm_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ $params['raise_warnings'] = 0; @@ -276,15 +276,15 @@ function CategoryItemCount($params) { - $count_helper =& $this->Application->recallObject('CountHelper'); + $count_helper = $this->Application->recallObject('CountHelper'); /* @var $count_helper kCountHelper */ return $count_helper->CategoryItemCount('bb', $params, 'SUM(Posts)'); // - COUNT(TopicId) } function ItemCount($params) { - $count_helper =& $this->Application->recallObject('CountHelper'); + $count_helper = $this->Application->recallObject('CountHelper'); /* @var $count_helper kCountHelper */ $today_only = isset($params['today']) && $params['today']; Index: branches/5.2.x/units/polls/poll_tp.php =================================================================== diff -u -N -r14252 -r15140 --- branches/5.2.x/units/polls/poll_tp.php (.../poll_tp.php) (revision 14252) +++ branches/5.2.x/units/polls/poll_tp.php (.../poll_tp.php) (revision 15140) @@ -1,6 +1,6 @@ getObject($params); /* @var $object kDBItem */ - $spam_helper =& $this->Application->recallObject('SpamHelper'); + $spam_helper = $this->Application->recallObject('SpamHelper'); /* @var $spam_helper SpamHelper */ $spam_helper->InitHelper($object->GetID(), 'PollComment', 0); // PollId used for SpamControl only Index: branches/5.2.x/units/helpers/post_helper.php =================================================================== diff -u -N -r14701 -r15140 --- branches/5.2.x/units/helpers/post_helper.php (.../post_helper.php) (revision 14701) +++ branches/5.2.x/units/helpers/post_helper.php (.../post_helper.php) (revision 15140) @@ -1,6 +1,6 @@ Application->recallObject('bb-post.-item', null, Array ('skip_autoload' => true)); + $post = $this->Application->recallObject('bb-post.-item', null, Array ('skip_autoload' => true)); /* @var $post kDBItem */ $post->Load($regs[1]); Index: branches/5.2.x/units/topics/topics_event_handler.php =================================================================== diff -u -N -r15133 -r15140 --- branches/5.2.x/units/topics/topics_event_handler.php (.../topics_event_handler.php) (revision 15133) +++ branches/5.2.x/units/topics/topics_event_handler.php (.../topics_event_handler.php) (revision 15140) @@ -1,6 +1,6 @@ SetDBField('TodayDate', adodb_date('Y-m-d')); } - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ $object->SetDBField('TopicText', $post_helper->CensorText($object->GetDBField('TopicText'))); @@ -121,7 +121,7 @@ $object =& $event->getObject(); /* @var $object kDBItem */ - $post =& $this->Application->recallObject($event->Prefix . '-post', null, Array ('skip_autoload' => true)); + $post = $this->Application->recallObject($event->Prefix . '-post', null, Array ('skip_autoload' => true)); /* @var $post kDBItem */ $post->SetDBField('Pending', $object->GetDBField('Status') == STATUS_ACTIVE ? 0 : 1); @@ -156,7 +156,7 @@ /* @var $object kCatDBItem */ if ( $object->GetDBField('Posts') == 1 ) { - $post =& $this->Application->recallObject($event->Prefix . '-post', null, Array ('skip_autoload' => true)); + $post = $this->Application->recallObject($event->Prefix . '-post', null, Array ('skip_autoload' => true)); /* @var $post kDBItem */ $main_status = $object->GetDBField('Status'); Index: branches/5.2.x/units/posts/post_eh.php =================================================================== diff -u -N -r15133 -r15140 --- branches/5.2.x/units/posts/post_eh.php (.../post_eh.php) (revision 15133) +++ branches/5.2.x/units/posts/post_eh.php (.../post_eh.php) (revision 15140) @@ -1,6 +1,6 @@ SetDBField('PosterAlias', $this->Conn->GetOne($sql)); // set post options - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ $options_map = $post_helper->getOptionsMap(); @@ -101,7 +101,7 @@ WHERE p.'.$object->IDField.' = '.$object->GetID(); $post_info = $this->Conn->GetRow($sql); - $perm_helper =& $this->Application->recallObject('PermissionsHelper'); + $perm_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ $is_owner = $post_info['CreatedById'] == $this->Application->RecallVar('user_id'); @@ -131,7 +131,7 @@ return; } - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ $options_map = $post_helper->getOptionsMap(); @@ -190,7 +190,7 @@ $object =& $event->getObject(); /* @var $object kDBItem */ - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ $options_map = $post_helper->getOptionsMap(); @@ -218,14 +218,14 @@ $parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); - $main_object =& $this->Application->recallObject($parent_prefix); + $main_object = $this->Application->recallObject($parent_prefix); /* @var $main_object kCatDBItem */ // update user posts counter $user_posts = $this->Application->RecallPersistentVar('bb_posts'); $this->Application->StorePersistentVar('bb_posts', $user_posts + 1); - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ $category_id = $this->Application->GetVar('m_cat_id'); @@ -343,7 +343,7 @@ return; } - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ // update posts count in topic @@ -356,7 +356,7 @@ $this->Conn->Query($sql); - $main_object =& $this->Application->recallObject('bb.-item', null, Array ('skip_autoload' => true)); + $main_object = $this->Application->recallObject('bb.-item', null, Array ('skip_autoload' => true)); /* @var $main_object kCatDBItem */ $main_object->Load($topic_id); @@ -430,7 +430,7 @@ $object =& $event->getObject(); /* @var $object kDBItem */ - $source_post =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); + $source_post = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true)); /* @var $source_post kDBItem */ $source_post->Load($reply_to); Index: branches/5.2.x/units/private_messages/private_message_tp.php =================================================================== diff -u -N -r14252 -r15140 --- branches/5.2.x/units/private_messages/private_message_tp.php (.../private_message_tp.php) (revision 14252) +++ branches/5.2.x/units/private_messages/private_message_tp.php (.../private_message_tp.php) (revision 15140) @@ -1,6 +1,6 @@ getObject($params); - $post_helper =& $this->Application->recallObject('PostHelper'); + $post_helper = $this->Application->recallObject('PostHelper'); /* @var $post_helper PostHelper */ // 2. parse post body Index: branches/5.2.x/units/poll_comments/poll_comment_eh.php =================================================================== diff -u -N -r15133 -r15140 --- branches/5.2.x/units/poll_comments/poll_comment_eh.php (.../poll_comment_eh.php) (revision 15133) +++ branches/5.2.x/units/poll_comments/poll_comment_eh.php (.../poll_comment_eh.php) (revision 15140) @@ -1,6 +1,6 @@ Application->recallObject('SpamHelper'); + $spam_helper = $this->Application->recallObject('SpamHelper'); /* @var $spam_helper SpamHelper */ $spam_helper->InitHelper($poll_id, 'PollComment', 0); // ResourceId used for SpamControl only @@ -146,7 +146,7 @@ parent::OnAfterItemCreate($event); if ( !$this->Application->isAdminUser ) { - $spam_helper =& $this->Application->recallObject('SpamHelper'); + $spam_helper = $this->Application->recallObject('SpamHelper'); /* @var $spam_helper SpamHelper */ $object =& $event->getObject();