Index: branches/5.2.x/core/units/modules/modules_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/modules/modules_event_handler.php (.../modules_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/modules/modules_event_handler.php (.../modules_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( $event->Special ) { @@ -80,7 +80,7 @@ return ; } - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -160,7 +160,7 @@ $toolkit = new kInstallToolkit(); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ foreach ($new_modules as $module) { Index: branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php (.../custom_fields_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php (.../custom_fields_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $item_type = $this->Application->GetVar('cf_type'); @@ -134,7 +134,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sql = 'SELECT COUNT(*) @@ -160,7 +160,7 @@ { parent::OnAfterItemDelete($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $main_prefix = $this->getPrefixByItemType($object->GetDBField('Type')); @@ -202,7 +202,7 @@ return ; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $main_prefix = $this->getPrefixByItemType($object->GetDBField('Type')); @@ -245,7 +245,7 @@ { parent::OnPreCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('Type', $this->Application->GetVar('cf_type')); @@ -262,7 +262,7 @@ { parent::OnAfterItemLoad($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !in_array($object->GetDBField('ElementType'), $this->_getMultiElementTypes()) ) { @@ -315,7 +315,7 @@ { parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !in_array($object->GetDBField('ElementType'), $this->_getMultiElementTypes()) ) { Index: branches/5.2.x/core/units/users/users_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $event->Special == 'forgot' || $object->getFormName() == 'registration' ) { @@ -105,7 +105,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( $event->Special == 'regular' ) { @@ -280,7 +280,7 @@ */ protected function OnLogin($event) { - $object =& $event->getObject( Array ('form_name' => 'login') ); + $object = $event->getObject( Array ('form_name' => 'login') ); /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); @@ -419,7 +419,7 @@ return ; } - $object =& $event->getObject( Array('form_name' => 'registration') ); + $object = $event->getObject( Array('form_name' => 'registration') ); /* @var $object UsersItem */ $field_values = $this->getSubmittedFields($event); @@ -492,7 +492,7 @@ */ function autoLoginUser($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( $object->GetDBField('Status') == STATUS_ACTIVE ) { @@ -524,7 +524,7 @@ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( !$object->isSubscriberOnly() ) { @@ -593,7 +593,7 @@ */ protected function assignToPrimaryGroup($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $primary_group_id = $object->GetDBField('PrimaryGroupId'); @@ -623,7 +623,7 @@ */ protected function OnAfterItemValidate(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $resource_id = $object->GetDBField('ResourceId'); @@ -640,7 +640,7 @@ */ function OnRecommend($event) { - $object =& $event->getObject( Array ('form_name' => 'recommend') ); + $object = $event->getObject( Array ('form_name' => 'recommend') ); /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); @@ -678,7 +678,7 @@ */ function OnUpdateAddress($event) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -710,7 +710,7 @@ */ function OnSubscribeQuery($event) { - $object =& $event->getObject( Array ('form_name' => 'subscription') ); + $object = $event->getObject( Array ('form_name' => 'subscription') ); /* @var $object UsersItem */ $field_values = $this->getSubmittedFields($event); @@ -743,7 +743,7 @@ */ function OnSubscribeUser($event) { - $object =& $event->getObject( Array ('form_name' => 'subscription') ); + $object = $event->getObject( Array ('form_name' => 'subscription') ); /* @var $object UsersItem */ $user_email = $this->Application->GetVar('subscriber_email'); @@ -844,7 +844,7 @@ */ function OnForgotPassword($event) { - $object =& $event->getObject( Array ('form_name' => 'forgot_password') ); + $object = $event->getObject( Array ('form_name' => 'forgot_password') ); /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); @@ -939,7 +939,7 @@ $cs_helper->CheckStateField($event, 'State', 'Country'); $cs_helper->PopulateStates($event, 'State', 'Country'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $event->Special == 'forgot' ) { @@ -967,7 +967,7 @@ */ function beforeItemChanged($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( !$this->Application->isAdmin && $object->getFormName() == 'registration' ) { @@ -1003,7 +1003,7 @@ { $event->SetRedirectParam('opener', 's'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ $next_template = false; @@ -1092,7 +1092,7 @@ $item_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); list($id, $field_values) = each($item_info); - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ $object->setID($id); @@ -1206,7 +1206,7 @@ } if ( $user_id == USER_ROOT ) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object UsersItem */ // put salt to user's config @@ -1243,7 +1243,7 @@ } } else { - $object =& $event->getObject(); + $object = $event->getObject(); $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); if ( !$object->Update() ) { @@ -1298,7 +1298,7 @@ */ protected function checkItemStatus(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->isLoaded() ) { @@ -1323,7 +1323,7 @@ $this->afterItemChanged($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( !$this->Application->isAdmin && ($event->Special != 'email-restore') ) { @@ -1346,7 +1346,7 @@ { $this->saveUserImages($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( $object->GetDBField('EmailPassword') && $object->GetDBField('Password_plain') ) { @@ -1406,7 +1406,7 @@ $email_passwords = unserialize($email_passwords); if ( isset($email_passwords[$temp_id]) ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SwitchToLive(); @@ -1487,7 +1487,7 @@ */ protected function sendEmailChangeEvent(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ $new_email = $object->GetDBField('Email'); @@ -1633,7 +1633,7 @@ { parent::OnBeforeClone($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ $object->generatePassword(); @@ -1720,7 +1720,7 @@ $image_helper = $this->Application->recallObject('ImageHelper'); /* @var $image_helper ImageHelper */ - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ $image_helper->LoadItemImages($object); @@ -1760,7 +1760,7 @@ $image_helper = $this->Application->recallObject('ImageHelper'); /* @var $image_helper ImageHelper */ - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // process image upload in virtual fields @@ -1783,7 +1783,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $user_type = $this->Application->GetVar('user_type'); @@ -1810,7 +1810,7 @@ */ function _makePasswordRequired($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $required_fields = Array ('Password', 'Password_plain', 'VerifyPassword', 'VerifyPassword_plain'); @@ -1831,7 +1831,7 @@ if ( $id < 0 ) { // when root, guest and so on - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->Clear($id); @@ -1882,7 +1882,7 @@ */ function OnResetLostPassword($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $event->CallSubEvent('OnUpdate'); Index: branches/5.2.x/core/units/images/image_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/images/image_event_handler.php (.../image_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/images/image_event_handler.php (.../image_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $event->Name == 'OnMassDelete' && $type == 'before' ) { @@ -251,7 +251,7 @@ */ protected function OnSetPrimary($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('DefaultImg', 1); @@ -285,7 +285,7 @@ $this->processImageStatus($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->Update(); @@ -298,7 +298,7 @@ */ function processImageStatus($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $id = $object->GetDBField('ResourceId'); @@ -334,7 +334,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( !$this->Application->isAdminUser ) { Index: branches/5.2.x/core/units/skins/skin_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/skins/skin_eh.php (.../skin_eh.php) (revision 15137) +++ branches/5.2.x/core/units/skins/skin_eh.php (.../skin_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('IsPrimary', 0); @@ -115,7 +115,7 @@ { parent::OnAfterItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->IsTempTable() ) { @@ -135,7 +135,7 @@ */ protected function OnCompileStylesheet($event) { - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ $object->SwitchToLive(); Index: branches/5.2.x/core/units/files/file_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/files/file_eh.php (.../file_eh.php) (revision 15137) +++ branches/5.2.x/core/units/files/file_eh.php (.../file_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('CreatedById', $this->Application->RecallVar('user_id')); @@ -62,7 +62,7 @@ { parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->GetDBField('FileName') ) { @@ -82,7 +82,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( !$this->Application->isAdminUser ) { @@ -97,7 +97,7 @@ */ function OnDownloadFile($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $file_helper = $this->Application->recallObject('FileHelper'); Index: branches/5.2.x/core/units/filters/item_filter_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/filters/item_filter_eh.php (.../item_filter_eh.php) (revision 15137) +++ branches/5.2.x/core/units/filters/item_filter_eh.php (.../item_filter_eh.php) (revision 15145) @@ -47,7 +47,7 @@ parent::SetCustomQuery($event); if ( !$this->Application->isAdmin ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $prefix_info = $this->Application->processPrefix($event->getEventParam('prefix')); @@ -91,7 +91,7 @@ { parent::OnBeforeItemValidate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $prefix = $object->GetDBField('ItemPrefix'); @@ -133,7 +133,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !isset($cache) ) { Index: branches/5.2.x/core/units/themes/themes_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/themes/themes_eh.php (.../themes_eh.php) (revision 15137) +++ branches/5.2.x/core/units/themes/themes_eh.php (.../themes_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( in_array($event->Special, Array ('enabled', 'selected', 'available')) || !$this->Application->isAdminUser ) { Index: branches/5.2.x/core/units/forms/forms/forms_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/forms/forms/forms_eh.php (.../forms_eh.php) (revision 15137) +++ branches/5.2.x/core/units/forms/forms/forms_eh.php (.../forms_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $fields = explode(',',$this->Application->GetVar('fields')); @@ -296,7 +296,7 @@ */ function _validatePopSettings($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $modes = Array ('Reply', 'Bounce'); @@ -356,7 +356,7 @@ */ function _setRequired($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $required = $object->GetDBField('EnableEmailCommunication'); @@ -379,7 +379,7 @@ */ function _disableSecurityImage($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ($object->GetDBField('RequireLogin')) { Index: branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php (.../submission_log_eh.php) (revision 15137) +++ branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php (.../submission_log_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $form_submission = $this->Application->recallObject('formsubs'); @@ -212,7 +212,7 @@ return ; } - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $sql = 'SELECT f.ReplyFromEmail, sl.' . $object->IDField . ' @@ -277,7 +277,7 @@ */ function _validateRecipients($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $esender = $this->Application->recallObject('EmailSender'); @@ -414,7 +414,7 @@ { parent::OnAfterItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $this->_sendEmail($object); // send email @@ -451,7 +451,7 @@ */ function _getLastMessageId($event, $from_client = false) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $form_submission =& $this->_getFormSubmission($object); @@ -481,7 +481,7 @@ $this->_updateSubmission($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // send out email event to admin for bouncing @@ -499,7 +499,7 @@ */ function _updateStatusDates($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $now = adodb_mktime(); @@ -549,7 +549,7 @@ */ function _updateSubmission($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $form_submission =& $this->_getFormSubmission($object); @@ -595,7 +595,7 @@ */ function OnSaveDraft($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true)); @@ -638,7 +638,7 @@ */ function OnUseDraft($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true)); @@ -675,7 +675,7 @@ */ function OnDeleteDraft($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true)); Index: branches/5.2.x/core/units/priorites/priority_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/priorites/priority_eh.php (.../priority_eh.php) (revision 15137) +++ branches/5.2.x/core/units/priorites/priority_eh.php (.../priority_eh.php) (revision 15145) @@ -1,6 +1,6 @@ MasterEvent->getObject(); + $object = $event->MasterEvent->getObject(); $tmp = $this->Application->RecallVar('priority_changes'.$this->Application->GetVar('m_wid')); $changes = $tmp ? unserialize($tmp) : array(); @@ -279,7 +279,7 @@ function OnItemCreate($event) { - $obj =& $event->MasterEvent->getObject(); + $obj = $event->MasterEvent->getObject(); if ($obj->GetDBField('Priority') == 0) { $priority_helper = $this->Application->recallObject('PriorityHelper'); /* @var $priority_helper kPriorityHelper */ Index: branches/5.2.x/core/units/helpers/ajax_form_helper.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/helpers/ajax_form_helper.php (.../ajax_form_helper.php) (revision 15137) +++ branches/5.2.x/core/units/helpers/ajax_form_helper.php (.../ajax_form_helper.php) (revision 15145) @@ -11,7 +11,7 @@ */ public function prepareJSONErrors($event, &$response) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $response['status'] = 'FAILED'; Index: branches/5.2.x/core/units/category_items/category_items_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/category_items/category_items_event_handler.php (.../category_items_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/category_items/category_items_event_handler.php (.../category_items_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $ml_formatter = $this->Application->recallObject('kMultiLanguage'); @@ -44,7 +44,7 @@ */ function OnSetPrimary($event) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -71,7 +71,7 @@ protected function customProcessing(kEvent $event, $type) { if ( $event->Name == 'OnMassDelete' ) { - $object =& $event->getObject(); + $object = $event->getObject(); $table_info = $object->getLinkedInfo(); switch ($type) { Index: branches/5.2.x/core/units/statistics/statistics_event_handler.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/statistics/statistics_event_handler.php (.../statistics_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/statistics/statistics_event_handler.php (.../statistics_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( $event->Special == 'summary' ) { Index: branches/5.2.x/core/units/scheduled_tasks/scheduled_task_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/scheduled_tasks/scheduled_task_eh.php (.../scheduled_task_eh.php) (revision 15137) +++ branches/5.2.x/core/units/scheduled_tasks/scheduled_task_eh.php (.../scheduled_task_eh.php) (revision 15145) @@ -1,6 +1,6 @@ Application->EventManager->getScheduledTasks(true); - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ $processed_ids = Array (); @@ -127,7 +127,7 @@ $ids = $this->StoreSelectedIDs($event); if ($ids) { - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ foreach ($ids as $id) { @@ -154,7 +154,7 @@ $ids = $this->StoreSelectedIDs($event); if ($ids) { - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ $where_clause = Array ( Index: branches/5.2.x/core/units/helpers/controls/edit_picker_helper.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/helpers/controls/edit_picker_helper.php (.../edit_picker_helper.php) (revision 15137) +++ branches/5.2.x/core/units/helpers/controls/edit_picker_helper.php (.../edit_picker_helper.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $main_object = $this->Application->recallObject($event->getEventParam('link_to_prefix')); @@ -74,7 +74,7 @@ */ function LoadValues($event, $store_field, $source_field) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ list ($sub_prefix, $sub_prefix_field) = explode('.', $source_field); Index: branches/5.2.x/core/units/thesaurus/thesaurus_eh.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/thesaurus/thesaurus_eh.php (.../thesaurus_eh.php) (revision 15130) +++ branches/5.2.x/core/units/thesaurus/thesaurus_eh.php (.../thesaurus_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( !$this->Application->isAdminUser ) { Index: branches/5.2.x/core/units/helpers/cat_dbitem_export_helper.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/helpers/cat_dbitem_export_helper.php (.../cat_dbitem_export_helper.php) (revision 15137) +++ branches/5.2.x/core/units/helpers/cat_dbitem_export_helper.php (.../cat_dbitem_export_helper.php) (revision 15145) @@ -1,6 +1,6 @@ false ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ } @@ -222,7 +222,7 @@ $this->fillRequiredFields($event, $this->false); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ $cross_unique_fields = Array('FieldsSeparatedBy', 'FieldsEnclosedBy'); @@ -326,7 +326,7 @@ } else { $check_fields = $this->exportOptions['DuplicateCheckFields'] ? explode('|', substr($this->exportOptions['DuplicateCheckFields'], 1, -1)) : Array(); - $object =& $event->getObject(); + $object = $event->getObject(); $fields = $object->getFields(); $language_id = $this->Application->GetDefaultLanguageId(); @@ -547,7 +547,7 @@ { $this->exportOptions = $this->loadOptions($event); $this->exportFields = $this->exportOptions['ExportColumns']; - $this->curItem =& $event->getObject( Array('skip_autoload' => true) ); + $this->curItem = $event->getObject( Array('skip_autoload' => true) ); $this->customFields = $this->Application->getUnitOption($event->Prefix, 'CustomFields'); $this->openFile($event); @@ -773,7 +773,7 @@ { switch ($object_type) { case IMPORT_TEMP: - $this->curItem =& $event->getObject( Array('skip_autoload' => true) ); + $this->curItem = $event->getObject( Array('skip_autoload' => true) ); break; case IMPORT_LIVE: @@ -1247,7 +1247,7 @@ */ function prepareExportColumns($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kCatDBItem */ if ( !$object->isField('ExportColumns') ) { @@ -1334,7 +1334,7 @@ */ function PrepareExportPresets($event) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $options = $object->GetFieldOptions('ExportPresets'); @@ -1406,7 +1406,7 @@ $import_filenames[$file] = $file . ' (' . kUtil::formatSize( $file_info->getSize() ) . ')'; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetFieldOption('ImportLocalFilename', 'options', $import_filenames); @@ -1442,7 +1442,7 @@ list($item_id, $field_values) = each($items_info); - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); @@ -1542,7 +1542,7 @@ $required_fields['export'] = Array('ExportFormat', 'ExportFilename','ExportColumns'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ($this->_getExportSavePreset($object)) { Index: branches/5.2.x/core/units/content/content_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/content/content_eh.php (.../content_eh.php) (revision 15137) +++ branches/5.2.x/core/units/content/content_eh.php (.../content_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); @@ -162,7 +162,7 @@ function getContentBlockAndRevision($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); Index: branches/5.2.x/core/units/page_revisions/page_revision_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/page_revisions/page_revision_eh.php (.../page_revision_eh.php) (revision 15137) +++ branches/5.2.x/core/units/page_revisions/page_revision_eh.php (.../page_revision_eh.php) (revision 15145) @@ -62,7 +62,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $page_id = $event->getEventParam('page_id'); @@ -111,7 +111,7 @@ } // no revisions -> create live revision - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('PageId', $page_id); @@ -136,7 +136,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $this->Application->isAdmin ) { @@ -158,7 +158,7 @@ { parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $object->GetDBField('IsDraft') == 0 && $object->GetOriginalField('IsDraft') == 1 ) { @@ -178,7 +178,7 @@ { parent::OnAfterItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->GetDBField('FromRevisionId') ) { @@ -210,7 +210,7 @@ { parent::OnAfterItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $status = $object->GetDBField('Status'); @@ -257,7 +257,7 @@ $revision_id = $this->getCurrentDraftRevision($event); if ( $revision_id ) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $object->Load($revision_id); Index: branches/5.2.x/core/units/promo_blocks/promo_block_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/promo_blocks/promo_block_eh.php (.../promo_block_eh.php) (revision 15137) +++ branches/5.2.x/core/units/promo_blocks/promo_block_eh.php (.../promo_block_eh.php) (revision 15145) @@ -68,7 +68,7 @@ { parent::OnPreCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $promo_block_group = $this->Application->recallObject('promo-block-group'); @@ -100,7 +100,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( $this->Application->isAdmin ) { @@ -135,7 +135,7 @@ */ protected function OnSetSticky(kEvent $event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -194,7 +194,7 @@ */ protected function _itemChanged(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $date_from = $object->GetDBField('ScheduleFromDate_date'); @@ -229,7 +229,7 @@ */ protected function OnFollowLink(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $this->_incrementField($event, 'NumberOfClicks', false); @@ -267,7 +267,7 @@ } } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->isLoaded() ) { @@ -293,7 +293,7 @@ */ protected function OnResetCounters(kEvent $event) { - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); Index: branches/5.2.x/core/units/promo_block_groups/promo_block_group_eh.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/promo_block_groups/promo_block_group_eh.php (.../promo_block_group_eh.php) (revision 15130) +++ branches/5.2.x/core/units/promo_block_groups/promo_block_group_eh.php (.../promo_block_group_eh.php) (revision 15145) @@ -51,7 +51,7 @@ */ private function beforeItemChange($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->setRequired('TransitionEffectCustom', $object->GetDBField('TransitionEffect') == '-1'); @@ -69,7 +69,7 @@ { parent::OnBeforeItemDelete($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sql = 'SELECT BlockId Index: branches/5.2.x/core/units/selectors/selectors_event_handler.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ Init($event->Prefix, '-item'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $title_field = 'SelectorName'; @@ -105,7 +105,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ switch ($event->Special) { @@ -205,7 +205,7 @@ */ function SaveChanges($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -240,7 +240,7 @@ { $this->SaveChanges($event); - $object =& $event->getObject(); + $object = $event->getObject(); $this->Application->SetVar($event->getPrefixSpecial().'_id', $object->GetId() ); $this->finalizePopup($event); @@ -257,7 +257,7 @@ { parent::OnAfterItemLoad($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $selector_data = $object->GetDBField('SelectorData'); @@ -280,7 +280,7 @@ */ function SerializeSelectorData($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $selector_data = $object->GetDBField('SelectorData'); @@ -304,7 +304,7 @@ */ function UnserializeSelectorData($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $selector_data = $object->GetDBField('SelectorData'); @@ -329,7 +329,7 @@ */ function OnPrepareBaseStyles($event) { - $object =& $event->getObject(); + $object = $event->getObject(); $parent_info = $object->getLinkedInfo(); $title_field = $this->Application->getUnitOption($event->Prefix,'TitleField'); @@ -348,7 +348,7 @@ */ function RemoveParentProperties($event, $selector_data) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $parent_id = $object->GetDBField('ParentId'); @@ -391,7 +391,7 @@ */ function AddParentProperties($event, $selector_data) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $parent_id = $object->GetDBField('ParentId'); @@ -421,7 +421,7 @@ */ function OnResetToBase($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object SelectorsItem */ $field_values = $this->getSubmittedFields($event); @@ -438,7 +438,7 @@ */ function OnMassResetToBase($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object SelectorsItem */ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); Index: branches/5.2.x/core/units/favorites/favorites_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/favorites/favorites_eh.php (.../favorites_eh.php) (revision 15137) +++ branches/5.2.x/core/units/favorites/favorites_eh.php (.../favorites_eh.php) (revision 15145) @@ -1,6 +1,6 @@ GetDBField('ResourceId').')'; $favorite_id = $this->Conn->GetOne($sql); - $object =& $event->getObject(Array('skip_autoload' => true)); + $object = $event->getObject(Array('skip_autoload' => true)); /* @var $object kDBItem */ if ($favorite_id) { @@ -80,7 +80,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $user_id = $this->Application->RecallVar('user_id'); @@ -101,7 +101,7 @@ */ function OnDeleteFavoriteItem($event) { - $main_object =& $event->MasterEvent->getObject(); + $main_object = $event->MasterEvent->getObject(); $sql = 'DELETE FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').' WHERE ResourceId = '.$main_object->GetDBField('ResourceId'); Index: branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php (.../mailing_list_eh.php) (revision 15137) +++ branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php (.../mailing_list_eh.php) (revision 15145) @@ -1,6 +1,6 @@ Application->GetVar($recipient_type); if ( $recipients ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $to = $recipient_type . '_' . implode(';' . $recipient_type . '_', array_keys($recipients)); @@ -103,7 +103,7 @@ $this->_deleteQueue($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // delete mailing attachments after mailing is deleted @@ -126,7 +126,7 @@ */ function OnCancelMailing($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -153,7 +153,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$this->Application->GetVar('mailing_recipient_type') ) { @@ -185,7 +185,7 @@ { parent::OnAfterItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $status = $object->GetDBField('Status'); @@ -201,7 +201,7 @@ */ function _deleteQueue($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sql = 'DELETE FROM ' . $this->Application->getUnitOption('email-queue', 'TableName') . ' Index: branches/5.2.x/core/units/theme_files/theme_file_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/theme_files/theme_file_eh.php (.../theme_file_eh.php) (revision 15137) +++ branches/5.2.x/core/units/theme_files/theme_file_eh.php (.../theme_file_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $filename = $this->_getTemplatePath($object); @@ -87,7 +87,7 @@ { parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $file_data = $object->GetDBField('FileContents'); @@ -109,7 +109,7 @@ { parent::OnAfterItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $filename = $this->_getTemplatePath($object); @@ -158,7 +158,7 @@ { parent::OnNew($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $template_helper = $this->Application->recallObject('TemplateHelper'); @@ -179,7 +179,7 @@ */ function OnSaveBlock($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); Index: branches/5.2.x/core/units/configuration/configuration_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/configuration/configuration_event_handler.php (.../configuration_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $module = $this->Application->GetVar('module'); @@ -92,7 +92,7 @@ parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // ability to validate each configuration variable separately @@ -193,7 +193,7 @@ parent::OnAfterItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $object->GetDBField('ElementType') == 'password' ) { @@ -256,7 +256,7 @@ unset($items_info['ModuleRootCategory']); } - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ if ( $items_info ) { Index: branches/5.2.x/core/kernel/utility/event.php =================================================================== diff -u -N -r15144 -r15145 --- branches/5.2.x/core/kernel/utility/event.php (.../event.php) (revision 15144) +++ branches/5.2.x/core/kernel/utility/event.php (.../event.php) (revision 15145) @@ -1,6 +1,6 @@ Application->hasObject($this->prefixSpecial) ) { $top_event = $this; @@ -282,9 +282,7 @@ $params['parent_event'] = $top_event; } - $object = $this->Application->recallObject($this->prefixSpecial, $this->pseudoClass, $params); - - return $object; + return $this->Application->recallObject($this->prefixSpecial, $this->pseudoClass, $params); } /** @@ -318,10 +316,10 @@ * @param bool $inherit * @access public */ - public function copyFrom(&$source_event, $inherit = false) + public function copyFrom($source_event, $inherit = false) { - if ($inherit) { - $this->MasterEvent =& $source_event; + if ( $inherit ) { + $this->MasterEvent = $source_event; } else { $this->status = $source_event->status; Index: branches/5.2.x/core/units/forms/form_fields/form_field_eh.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/forms/form_fields/form_field_eh.php (.../form_field_eh.php) (revision 15130) +++ branches/5.2.x/core/units/forms/form_fields/form_field_eh.php (.../form_field_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $visibility_filter = $this->getVisiblilityFilter(); Index: branches/5.2.x/core/units/phrases/phrases_event_handler.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/phrases/phrases_event_handler.php (.../phrases_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $this->_setPhraseModule($object); @@ -150,7 +150,7 @@ { parent::OnNew($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $label = $this->Application->GetVar($event->getPrefixSpecial() . '_label'); @@ -212,7 +212,7 @@ protected function OnCreate(kEvent $event) { if ( $this->Application->GetVar($event->Prefix . '_label') ) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ if ( $this->Application->GetVar('m_lang') != $this->Application->GetVar('lang_id') ) { @@ -269,7 +269,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $primary_language_id = $this->Application->GetDefaultLanguageId(); @@ -313,7 +313,7 @@ */ function _phraseChanged($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $label = $object->GetDBField('Phrase'); Index: branches/5.2.x/core/units/reviews/reviews_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/reviews/reviews_event_handler.php (.../reviews_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // 1. get main item resource id (use object, because of temp tables in admin) @@ -179,7 +179,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( !$this->Application->isAdminUser ) { @@ -269,7 +269,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $parent_info = $object->getLinkedInfo(); @@ -318,7 +318,7 @@ { parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $rating = $object->GetDBField('Rating'); @@ -345,7 +345,7 @@ $spam_helper = $this->Application->recallObject('SpamHelper'); /* @var $spam_helper SpamHelper */ - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $parent_info = $object->getLinkedInfo(); @@ -379,7 +379,7 @@ $this->updateSubitemCounters($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $this->Application->isAdminUser && !$object->IsTempTable() ) { @@ -404,7 +404,7 @@ */ function _loadMainObject($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); @@ -429,7 +429,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); @@ -537,7 +537,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $this->Application->GetVar('ajax') == 'yes' ) { Index: branches/5.2.x/core/units/languages/languages_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getSelectedIDs($event); if ($ids) { $id = array_shift($ids); - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object LanguagesItem */ $object->Load($id); @@ -139,7 +139,7 @@ return ; } - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object LanguagesItem */ $object->SwitchToLive(); @@ -221,7 +221,7 @@ { parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $status_fields = $this->Application->getUnitOption($event->Prefix, 'StatusField'); @@ -244,7 +244,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( in_array($event->Special, Array ('enabled', 'selected', 'available')) ) { @@ -279,7 +279,7 @@ { parent::OnAfterItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $src_language = $object->GetDBField('CopyFromLanguage'); @@ -363,7 +363,7 @@ { parent::OnPreCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('CopyLabels', 1); @@ -596,7 +596,7 @@ { parent::OnBeforeItemDelete($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $object->GetDBField('PrimaryLang') || $object->GetDBField('AdminInterfaceLang') || $object->GetID() == $this->Application->GetVar('m_lang') ) { @@ -615,7 +615,7 @@ { parent::OnAfterItemDelete($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // clean EmailEvents table Index: branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php (.../form_submissions_eh.php) (revision 15137) +++ branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php (.../form_submissions_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $object->addFilter('form_filter', '%1$s.FormId = ' . (int)$this->Application->GetVar('form_id')); @@ -229,7 +229,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // allows user to view only it's last submission @@ -279,7 +279,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']); @@ -320,7 +320,7 @@ { parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->setRequired('MergeToSubmission', $object->GetDBField('IsMergeToSubmission')); @@ -402,7 +402,7 @@ return ; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $form_id = $object->GetDBField('FormId'); @@ -496,7 +496,7 @@ parent::OnUpdate($event); if ($event->status == kEvent::erSUCCESS) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $merge_to = $object->GetDBField('MergeToSubmission'); Index: branches/5.2.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 15137) +++ branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); Index: branches/5.2.x/core/units/translator/translator_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/translator/translator_event_handler.php (.../translator_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/translator/translator_event_handler.php (.../translator_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ Application->recallObject($obj_prefix); /* @var $object kDBItem */ - $translator =& $event->getObject(); + $translator = $event->getObject(); /* @var $translator kDBItem */ $def_lang = $this->Application->GetDefaultLanguageId(); @@ -139,7 +139,7 @@ */ protected function OnPreSave(kEvent $event) { - $translator =& $event->getObject(); + $translator = $event->getObject(); /* @var $translator kDBItem */ $field_values = $this->getSubmittedFields($event); @@ -169,7 +169,7 @@ { $event->CallSubEvent('OnPreSave'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('Language', $object->GetDBField('SwitchLanguage')); Index: branches/5.2.x/core/units/related_searches/related_searches_event_handler.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/related_searches/related_searches_event_handler.php (.../related_searches_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/related_searches/related_searches_event_handler.php (.../related_searches_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $table_info = $object->getLinkedInfo(); Index: branches/5.2.x/core/units/relationship/relationship_event_handler.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $table_info = $object->getLinkedInfo(); @@ -71,7 +71,7 @@ if ( $dst_field == 'TargetId' ) { // prepare target_id & target_type - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); $target_id = 0; $target_prefix = false; @@ -136,7 +136,7 @@ { parent::OnAfterItemLoad($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sql = 'SELECT Prefix @@ -218,7 +218,7 @@ $sql_parts['TargetName'] = str_replace('rel','%1$s',$sql_parts['TargetName']); } - $object =& $event->getObject(); + $object = $event->getObject(); $vars = Array('#ITEM_NAMES#', '#ITEM_TYPES#'); $replacements = Array( implode(', ',$sql_parts['ItemName']), $sql_parts['TargetName'] ); @@ -289,7 +289,7 @@ */ function OnDeleteForeignRelations($event) { - $main_object =& $event->MasterEvent->getObject(); + $main_object = $event->MasterEvent->getObject(); /* @var $main_object kDBItem */ $sql = 'DELETE FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . ' Index: branches/5.2.x/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( $event->Special == 'module' ) { @@ -118,7 +118,7 @@ $mapping = Array ('conf' => 'VariableValue', 'site-domain' => 'DefaultEmailRecipients'); if ( isset($mapping[$event->Special]) ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $target_object = $this->Application->recallObject($event->Special); @@ -139,7 +139,7 @@ { parent::OnPreCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('Headers', $this->Application->ConfigValue('Smtp_DefaultHeaders')); @@ -228,7 +228,7 @@ $name = $event->getEventParam('EmailEventName'); $type = $event->getEventParam('EmailEventType'); - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ if (!$object->isLoaded() || ($object->GetDBField('Event') != $name || $object->GetDBField('Type') != $type)) { @@ -962,7 +962,7 @@ { parent::OnAfterItemLoad($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if (!$this->Application->isDebugMode(false)) { @@ -997,7 +997,7 @@ */ function _itemChanged($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // validate email subject and body for parsing errors @@ -1082,7 +1082,7 @@ */ function _validateAddress($event, $field_prefix) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $address_type = $object->GetDBField($field_prefix . 'AddressType'); Index: branches/5.2.x/core/units/groups/groups_event_handler.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/groups/groups_event_handler.php (.../groups_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/groups/groups_event_handler.php (.../groups_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ switch ($event->Special) { Index: branches/5.2.x/core/units/visits/visits_event_handler.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $object->SetDBField('VisitDate_date', adodb_mktime()); @@ -75,7 +75,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $types = $event->getEventParam('types'); Index: branches/5.2.x/core/units/categories/categories_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $selected_ids = $this->Application->GetVar('selected_ids'); @@ -273,7 +273,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ // don't show "Content" category in advanced view @@ -532,7 +532,7 @@ $search_event = $event_mapping[$type]; $this->$search_event($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $search_sql = ' FROM ' . TABLE_PREFIX . 'ses_' . $this->Application->GetSID() . '_' . TABLE_PREFIX . 'Search @@ -687,7 +687,7 @@ return; } - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $object->addCalculatedField( @@ -751,7 +751,7 @@ $id = $event->getEventParam('id'); // loading anyway, because this object is needed by "c-perm:OnBeforeDeleteFromLive" event - $temp_object =& $event->getObject(Array ('skip_autoload' => true)); + $temp_object = $event->getObject(Array ('skip_autoload' => true)); /* @var $temp_object CategoriesItem */ $temp_object->Load($id); @@ -819,7 +819,7 @@ parent::OnPreCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // 2. preset template @@ -848,7 +848,7 @@ $is_editing = implode('', $ids); $old_statuses = $is_editing ? $this->_getCategoryStatus($ids) : Array (); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object CategoriesItem */ parent::OnSave($event); @@ -924,7 +924,7 @@ */ protected function OnPreSaveCreated(kEvent $event) { - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object CategoriesItem */ if ( $object->IsRoot() ) { @@ -946,7 +946,7 @@ { parent::OnAfterItemDelete($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sql = 'UPDATE ' . $object->TableName . ' @@ -1051,7 +1051,7 @@ $rb->Load($recycle_bin); - $cat =& $event->getObject(Array ('skip_autoload' => true)); + $cat = $event->getObject(Array ('skip_autoload' => true)); /* @var $cat CategoriesItem */ foreach ($ids as $id) { @@ -1320,7 +1320,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object CategoriesItem */ if ( $object->GetDBField('ParentId') <= 0 ) { @@ -1391,7 +1391,7 @@ $this->_beforeItemChange($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $object->GetChangedFields() ) { @@ -1415,7 +1415,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $cache_updater = $this->Application->makeClass('kPermCacheUpdater', Array (null, $object->GetDBField('ParentPath'))); @@ -1472,7 +1472,7 @@ $page = $this->Application->GetVar($page_var); if ( is_numeric($page) ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $object->SetPage($page); @@ -1499,7 +1499,7 @@ return; } - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object CategoriesItem */ $ids = $this->StoreSelectedIDs($event); @@ -1546,7 +1546,7 @@ */ protected function checkItemStatus(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->isLoaded() ) { @@ -1662,7 +1662,7 @@ */ function _beforeItemChange($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object CategoriesItem */ $object->checkFilename(); @@ -1771,7 +1771,7 @@ { parent::OnBeforeItemDelete($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $object->GetDBField('Protected') && !$this->Application->isDebugMode(false) ) { @@ -2112,7 +2112,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // remove this category & it's children from dropdown @@ -2139,7 +2139,7 @@ { parent::OnAfterItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object CategoriesItem */ // need to update path after category is created, so category is included in that path @@ -2292,7 +2292,7 @@ $event->setPseudoClass('_List'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $this->Application->SetVar($event->getPrefixSpecial().'_Page', 1); @@ -2564,7 +2564,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $id = $this->getPassedID($event); @@ -2601,7 +2601,7 @@ $actual_event_name = $event->getEventParam('actual_event'); if ( $actual_event_name == 'OnSavePriorityChanges' || $event_name == 'OnAfterItemLoad' || $event_name == 'OnAfterItemDelete' ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $constrain = 'ParentId = ' . $object->GetDBField('ParentId'); @@ -2878,7 +2878,7 @@ */ protected function OnAfterItemValidate(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $resource_id = $object->GetDBField('ResourceId'); @@ -2900,7 +2900,7 @@ { parent::OnBeforeClone($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('ResourceId', 0); // this will reset it Index: branches/5.2.x/core/units/helpers/country_states_helper.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/helpers/country_states_helper.php (.../country_states_helper.php) (revision 15130) +++ branches/5.2.x/core/units/helpers/country_states_helper.php (.../country_states_helper.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $country_iso = $object->GetDBField($country_field); @@ -157,7 +157,7 @@ */ function CheckStateField($event, $state_field, $country_field, $auto_required = true) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $country_iso = $object->GetDBField($country_field); Index: branches/5.2.x/core/units/helpers/brackets_helper.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/helpers/brackets_helper.php (.../brackets_helper.php) (revision 15137) +++ branches/5.2.x/core/units/helpers/brackets_helper.php (.../brackets_helper.php) (revision 15145) @@ -1,6 +1,6 @@ getBrackets($event); - $object =& $event->getObject(); + $object = $event->getObject(); foreach($field_values as $id => $record) { @@ -211,7 +211,7 @@ */ function OnInfinity($event) { - $object =& $event->getObject(); + $object = $event->getObject(); $infinite_exists = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$object->TableName.' WHERE '.$this->max_field.' = -1'); $field_values = $this->getBrackets($event); /*if(is_array($field_values)) @@ -256,7 +256,7 @@ { $items_info = $this->getBrackets($event); if ($items_info) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $linked_info = $object->getLinkedInfo(); @@ -314,7 +314,7 @@ */ function arrangeBrackets($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $temp = $this->getBrackets($event); @@ -465,7 +465,7 @@ */ function replaceInfinity($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $object->GetDBField($this->max_field) == '∞' ) { Index: branches/5.2.x/core/units/logs/change_logs/change_log_eh.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/logs/change_logs/change_log_eh.php (.../change_log_eh.php) (revision 15130) +++ branches/5.2.x/core/units/logs/change_logs/change_log_eh.php (.../change_log_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sql = 'UPDATE ' . $this->Application->getUnitOption('session-log', 'TableName') . ' Index: branches/5.2.x/core/units/helpers/captcha_helper.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/helpers/captcha_helper.php (.../captcha_helper.php) (revision 15130) +++ branches/5.2.x/core/units/helpers/captcha_helper.php (.../captcha_helper.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $valid_code = $this->Application->RecallVar($event->getPrefixSpecial() . '_captcha_code'); Index: branches/5.2.x/core/units/helpers/search_helper.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/helpers/search_helper.php (.../search_helper.php) (revision 15137) +++ branches/5.2.x/core/units/helpers/search_helper.php (.../search_helper.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // process search keyword @@ -251,7 +251,7 @@ $search_filter = Array(); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ foreach ($search_fields as $search_field) { @@ -463,7 +463,7 @@ return false; } - $object =& $event->getObject(); // don't recall it each time in getCustomFilterSearchClause + $object = $event->getObject(); // don't recall it each time in getCustomFilterSearchClause $grid_info = $this->Application->getUnitOption($event->Prefix.'.'.$grid_name, 'Grids'); foreach ($custom_filter as $field_name => $field_options) { list ($filter_type, $field_options) = each($field_options); @@ -793,7 +793,7 @@ } } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $object->addFilter('includes_filter', $includes_or_filter); Index: branches/5.2.x/core/units/logs/session_logs/session_log_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/logs/session_logs/session_log_eh.php (.../session_log_eh.php) (revision 15137) +++ branches/5.2.x/core/units/logs/session_logs/session_log_eh.php (.../session_log_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sql = 'SELECT ' . $this->Application->getUnitOption('change-log', 'IDField') . ' Index: branches/5.2.x/core/kernel/db/cat_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 15137) +++ branches/5.2.x/core/kernel/db/cat_event_handler.php (.../cat_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $id = $this->getPassedID($event); @@ -438,7 +438,7 @@ $search_event = $event_mapping[$type]; $this->$search_event($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $search_sql = ' FROM ' . TABLE_PREFIX . 'ses_' . $this->Application->GetSID() . '_' . TABLE_PREFIX . 'Search @@ -595,7 +595,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ // add category filter if needed @@ -767,7 +767,7 @@ */ function prepareItemStatuses($event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); $property_map = $this->Application->getUnitOption($event->Prefix, 'ItemPropertyMappings'); if (!$property_map) { @@ -858,7 +858,7 @@ { parent::OnBeforeItemUpdate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ // update hits field @@ -897,7 +897,7 @@ $special = substr($event->Special, -6); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ if ( $special == 'import' || $special == 'export' ) { @@ -972,7 +972,7 @@ $this->setCustomExportColumns($event); } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ if ( !$this->Application->isAdmin ) { @@ -1026,7 +1026,7 @@ { parent::OnAfterItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ if ( substr($event->Special, -6) == 'import' ) { @@ -1116,7 +1116,7 @@ $event->setPseudoClass('_List'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $this->Application->SetVar($event->getPrefixSpecial().'_Page', 1); @@ -1406,7 +1406,7 @@ $lang = $this->Application->GetVar('m_lang'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $object->SetPage(1); @@ -1815,7 +1815,7 @@ */ protected function SetPagination(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ // get PerPage (forced -> session -> config -> 10) @@ -1986,7 +1986,7 @@ */ protected function restorePrimaryImage($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ $has_image_info = $object->GetDBField('ImageAlt') && ($object->GetDBField('ThumbnailImage') || $object->GetDBField('FullImage')); @@ -2078,7 +2078,7 @@ if ( $dst_field == 'ItemCategory' ) { // Item Edit -> Categories Tab -> New Categories - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ $category_ids = explode(',', $selected_ids['c']); @@ -2111,7 +2111,7 @@ if ( $items_info ) { list($id, $field_values) = each($items_info); - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); @@ -2157,7 +2157,7 @@ */ function cacheItemOwner($event, $id_field, $cached_field) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $user_id = $object->GetDBField($id_field); @@ -2194,7 +2194,7 @@ if ( $event->status == kEvent::erSUCCESS && $use_pending_editing ) { // decision: clone or not clone - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ if ( $object->GetID() == 0 || $object->GetDBField('OrgId') > 0 ) { @@ -2267,7 +2267,7 @@ return ; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $owner_field = $this->getOwnerField($event->Prefix); @@ -2310,7 +2310,7 @@ { parent::OnBeforeClone($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SetDBField('ResourceId', 0); // this will reset it @@ -2331,7 +2331,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ $is_admin = $this->Application->isAdminUser; @@ -2360,7 +2360,7 @@ return ; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ $perm_helper = $this->Application->recallObject('PermissionsHelper'); @@ -2465,7 +2465,7 @@ return ; } - $object =& $event->getObject(Array('skip_autoload' => true)); + $object = $event->getObject(Array('skip_autoload' => true)); /* @var $object kCatDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -2556,7 +2556,7 @@ } // prepare redirect template - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $is_active = ($object->GetDBField('Status') == STATUS_ACTIVE); @@ -2604,7 +2604,7 @@ return ; } - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kCatDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -2661,7 +2661,7 @@ */ protected function checkItemStatus(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->isLoaded() ) { @@ -2815,7 +2815,7 @@ */ function OnDownloadFile($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kCatDBItem */ $event->status = kEvent::erSTOP; @@ -2849,7 +2849,7 @@ $rating_helper = $this->Application->recallObject('RatingHelper'); /* @var $rating_helper RatingHelper */ - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kCatDBItem */ $object->Load( $this->Application->GetVar('id') ); @@ -2941,7 +2941,7 @@ */ protected function OnAfterItemValidate(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $resource_id = $object->GetDBField('ResourceId'); Index: branches/5.2.x/core/units/forms/drafts/draft_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/forms/drafts/draft_eh.php (.../draft_eh.php) (revision 15137) +++ branches/5.2.x/core/units/forms/drafts/draft_eh.php (.../draft_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $user_id = $this->Application->RecallVar('user_id'); Index: branches/5.2.x/core/units/permission_types/permission_type_eh.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/permission_types/permission_type_eh.php (.../permission_type_eh.php) (revision 15130) +++ branches/5.2.x/core/units/permission_types/permission_type_eh.php (.../permission_type_eh.php) (revision 15145) @@ -27,7 +27,7 @@ { parent::OnBeforeItemDelete($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $object->GetDBField('IsSystem') ) { Index: branches/5.2.x/core/units/spam_reports/spam_report_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/spam_reports/spam_report_eh.php (.../spam_report_eh.php) (revision 15137) +++ branches/5.2.x/core/units/spam_reports/spam_report_eh.php (.../spam_report_eh.php) (revision 15145) @@ -63,7 +63,7 @@ { parent::OnBeforeItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $item_prefix = $this->Application->GetVar('item_prefix'); @@ -88,7 +88,7 @@ { parent::OnAfterItemCreate($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $item_prefix = $object->GetDBField('ItemPrefix'); @@ -126,7 +126,7 @@ $temp_handlers = Array (); $ids = $this->StoreSelectedIDs($event); - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ foreach ($ids as $id) { Index: branches/5.2.x/core/units/site_domains/site_domain_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/site_domains/site_domain_eh.php (.../site_domain_eh.php) (revision 15137) +++ branches/5.2.x/core/units/site_domains/site_domain_eh.php (.../site_domain_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $id = (int)$this->getPassedID($event); @@ -268,7 +268,7 @@ */ function _itemChanged($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $email_event_data = $this->Application->GetVar('emailevents_' . $event->Prefix); @@ -284,7 +284,7 @@ */ function _setRequired($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $redirect_mode = $object->GetDBField('RedirectOnIPMatch'); Index: branches/5.2.x/core/units/country_states/country_state_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/country_states/country_state_eh.php (.../country_state_eh.php) (revision 15137) +++ branches/5.2.x/core/units/country_states/country_state_eh.php (.../country_state_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( ($event->Special == 'selected') || ($event->Special == 'available') ) { @@ -95,7 +95,7 @@ */ function _setRequired($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $field_options = $object->GetFieldOptions('IsoCode'); @@ -123,7 +123,7 @@ { parent::OnBeforeItemDelete($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); Index: branches/5.2.x/core/units/helpers/priority_helper.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/helpers/priority_helper.php (.../priority_helper.php) (revision 15137) +++ branches/5.2.x/core/units/helpers/priority_helper.php (.../priority_helper.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $field_options = $object->GetFieldOptions('Priority'); Index: branches/5.2.x/core/units/permissions/permissions_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); $permissions_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $permissions_helper kPermissionsHelper */ @@ -118,7 +118,7 @@ return ; } - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ $group_id = $this->Application->GetVar('g_id'); @@ -189,7 +189,7 @@ */ function UpdatePermissions($event, $create_sql, $update_sql, $delete_ids) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ($delete_ids) { Index: branches/5.2.x/core/units/user_groups/user_groups_eh.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/user_groups/user_groups_eh.php (.../user_groups_eh.php) (revision 15137) +++ branches/5.2.x/core/units/user_groups/user_groups_eh.php (.../user_groups_eh.php) (revision 15145) @@ -1,6 +1,6 @@ getEventParam('ids'); if ( $ids ) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); if ( $event->Prefix == 'u-ug' ) { // allow deleting non-primary group of current user ($ids - groups) Index: branches/5.2.x/core/units/helpers/controls/minput_helper.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/helpers/controls/minput_helper.php (.../minput_helper.php) (revision 15137) +++ branches/5.2.x/core/units/helpers/controls/minput_helper.php (.../minput_helper.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -149,7 +149,7 @@ */ function LoadValues($event, $store_field, $sub_prefix, $use_fields) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sub_item = $this->Application->recallObject($sub_prefix, null, Array('skip_autoload' => true)); Index: branches/5.2.x/core/units/stylesheets/stylesheets_event_handler.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/stylesheets/stylesheets_event_handler.php (.../stylesheets_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/stylesheets/stylesheets_event_handler.php (.../stylesheets_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object StylesheetsItem */ $object->SwitchToLive(); Index: branches/5.2.x/core/units/config_search/config_search_event_handler.php =================================================================== diff -u -N -r15130 -r15145 --- branches/5.2.x/core/units/config_search/config_search_event_handler.php (.../config_search_event_handler.php) (revision 15130) +++ branches/5.2.x/core/units/config_search/config_search_event_handler.php (.../config_search_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBList */ // show only items that belong to selected module @@ -107,15 +107,15 @@ */ protected function OnCreateCustomField($event) { - $custom_field =& $event->MasterEvent->getObject(); + $custom_field = $event->MasterEvent->getObject(); /* @var $custom_field kDBItem */ if ( $custom_field->GetDBField('Type') == 6 || $custom_field->GetDBField('IsSystem') == 1 ) { // user & system custom fields are not searchable return ; } - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $custom_id = $custom_field->GetID(); Index: branches/5.2.x/core/kernel/db/db_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 15137) +++ branches/5.2.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->isLoaded() ) { @@ -563,7 +563,7 @@ */ protected function OnItemBuild(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $this->dbBuild($object, $event); @@ -678,7 +678,7 @@ */ protected function LoadItem(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $id = $this->getPassedID($event); @@ -709,7 +709,7 @@ */ protected function OnListBuild(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ /*if ( $this->Application->isDebugMode() ) { @@ -864,7 +864,7 @@ case 'sort_by': $event->setPseudoClass('_List'); - $object =& $event->getObject(Array ('main_list' => 1)); + $object = $event->getObject(Array ('main_list' => 1)); /* @var $object kDBList */ if ( $list_helper->hasUserSorting($object) ) { @@ -885,7 +885,7 @@ */ protected function SetPagination(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ // get PerPage (forced -> session -> config -> 10) @@ -942,7 +942,7 @@ */ protected function getPerPage(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $per_page = $event->getEventParam('per_page'); @@ -1028,7 +1028,7 @@ { $event->setPseudoClass('_List'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( $object->isMainList() ) { @@ -1179,7 +1179,7 @@ */ protected function AddFilters(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $edit_mark = rtrim($this->Application->GetSID() . '_' . $this->Application->GetTopmostWid($event->Prefix), '_'); @@ -1272,7 +1272,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ $where_clause = Array ( @@ -1390,7 +1390,7 @@ $event->setPseudoClass('_List'); $this->Application->SetVar('sort_by', $field . ',' . $dir); - $object =& $event->getObject(Array ('main_list' => 1)); + $object = $event->getObject(Array ('main_list' => 1)); /* @var $object kDBList */ $list_helper = $this->Application->recallObject('ListHelper'); @@ -1477,7 +1477,7 @@ */ protected function ItemPrepareQuery(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sqls = $object->getFormOption('ItemSQLs', Array ()); @@ -1500,7 +1500,7 @@ */ protected function ListPrepareQuery(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $sqls = $object->getFormOption('ListSQLs', Array ()); @@ -1532,7 +1532,7 @@ */ protected function OnCreate(kEvent $event) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -1587,7 +1587,7 @@ */ protected function _update(kEvent $event) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); @@ -1661,7 +1661,7 @@ */ protected function OnNew(kEvent $event) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $object->Clear(0); @@ -1689,7 +1689,7 @@ */ protected function OnCancel(kEvent $event) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -1835,7 +1835,7 @@ $this->StoreSelectedIDs($event, $live_ids); } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $this->SaveLoggedChanges($changes_var_name, $object->ShouldLogChanges()); @@ -1984,7 +1984,7 @@ */ public function isNewItemCreate(kEvent $event) { - $object =& $event->getObject( Array ('raise_warnings' => 0) ); + $object = $event->getObject( Array ('raise_warnings' => 0) ); /* @var $object kDBItem */ return !$object->isLoaded(); @@ -2032,7 +2032,7 @@ $event->CallSubEvent($not_created ? 'OnCreate' : 'OnUpdate'); if ( $event->status == kEvent::erSUCCESS ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $this->Application->SetVar($event->getPrefixSpecial() . '_id', $object->GetID()); @@ -2113,7 +2113,7 @@ $this->clearSelectedIDs($event); $this->Application->SetVar('m_lang', $this->Application->GetDefaultLanguageId()); - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event)); @@ -2141,7 +2141,7 @@ */ protected function OnPreSaveCreated(kEvent $event) { - $object =& $event->getObject( Array('skip_autoload' => true) ); + $object = $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); @@ -2172,7 +2172,7 @@ //do nothing - should reset :) if ( $this->isNewItemCreate($event) ) { // just reset id to 0 in case it was create - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ $object->setID(0); @@ -2194,7 +2194,7 @@ return ; } - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $ids = $this->StoreSelectedIDs($event); @@ -2297,7 +2297,7 @@ */ protected function OnPreSavePopup(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $this->RemoveRequiredFields($object); @@ -2358,7 +2358,7 @@ */ protected function OnAfterItemCreate(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->IsTempTable() ) { @@ -2387,7 +2387,7 @@ */ protected function OnAfterItemUpdate(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->IsTempTable() ) { @@ -2718,7 +2718,7 @@ { $this->Application->SetVar('allow_translation', true); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $this->RemoveRequiredFields($object); @@ -2792,7 +2792,7 @@ */ protected function OnSelectUser(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $items_info = $this->Application->GetVar('u'); @@ -3164,7 +3164,7 @@ return; } - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); $options = $object->GetFieldOptions($this->Application->GetVar('field')); $var_name = $this->_getPendingActionVariableName($event); @@ -3191,7 +3191,7 @@ return; } - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $field = $this->Application->GetVar('field'); @@ -3264,7 +3264,7 @@ return; } - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -3319,7 +3319,7 @@ $cur_value = $this->Application->GetVar('cur_value'); $fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); - $object =& $event->getObject(); + $object = $event->getObject(); if ( !$field || !$cur_value || !$object->isField($field) ) { return;