Index: branches/5.2.x/core/install/upgrades.php =================================================================== diff -u -N -r15012 -r15137 --- branches/5.2.x/core/install/upgrades.php (.../upgrades.php) (revision 15012) +++ branches/5.2.x/core/install/upgrades.php (.../upgrades.php) (revision 15137) @@ -1,6 +1,6 @@ Application->recallObject('kMultiLanguageHelper'); + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); /* @var $ml_helper kMultiLanguageHelper */ $this->Application->UnitConfigReader->iterateConfigs(Array (&$this, 'updateTextFields'), $ml_helper->getLanguages()); @@ -616,7 +616,7 @@ // Tables: PageContent, Images if ($this->Conn->TableFound('PageContent', true)) { // 1. replaces "/kernel/user_files/" references in content blocks - $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); /* @var $ml_helper kMultiLanguageHelper */ $languages = $ml_helper->getLanguages(); @@ -802,7 +802,7 @@ // make sure, that all categories have valid value for Priority field - $priority_helper =& $this->Application->recallObject('PriorityHelper'); + $priority_helper = $this->Application->recallObject('PriorityHelper'); /* @var $priority_helper kPriorityHelper */ $event = new kEvent('c:OnListBuild'); @@ -839,7 +839,7 @@ */ function _fixSkinColors() { - $skin =& $this->Application->recallObject('skin', null, Array ('skip_autoload' => 1)); + $skin = $this->Application->recallObject('skin', null, Array ('skip_autoload' => 1)); /* @var $skin kDBItem */ $skin->Load(1, 'IsPrimary'); @@ -873,7 +873,7 @@ $skin->SetDBField('Options', serialize($skin_options)); $skin->Update(); - $skin_helper =& $this->Application->recallObject('SkinHelper'); + $skin_helper = $this->Application->recallObject('SkinHelper'); /* @var $skin_helper SkinHelper */ $skin_file = $skin_helper->getSkinPath(); @@ -1293,7 +1293,7 @@ } // replace data in category custom fields used for category item template storage - $rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor'); + $rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor'); /* @var $rewrite_processor kRewriteUrlProcessor */ foreach ($this->Application->ModuleInfo as $module_name => $module_info) { @@ -1393,7 +1393,7 @@ } } - $updater =& $this->Application->makeClass('kPermCacheUpdater'); + $updater = $this->Application->makeClass('kPermCacheUpdater'); /* @var $updater kPermCacheUpdater */ $updater->OneStepRun(); @@ -1437,15 +1437,15 @@ $this->Conn->Query($sql); // create multilingual fields for phrases and email events - $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); /* @var $ml_helper kMultiLanguageHelper */ $ml_helper->createFields('phrases'); $ml_helper->createFields('emailevents'); $languages = $ml_helper->getLanguages(); if ($this->Conn->TableFound(TABLE_PREFIX . 'EmailMessage', true)) { - $email_message_helper =& $this->Application->recallObject('EmailMessageHelper'); + $email_message_helper = $this->Application->recallObject('EmailMessageHelper'); /* @var $email_message_helper EmailMessageHelper */ @@ -1558,7 +1558,7 @@ ADD INDEX (StateCountryId)'; $this->Conn->Query($sql); - $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); /* @var $ml_helper kMultiLanguageHelper */ $ml_helper->createFields('country-state'); @@ -1589,7 +1589,7 @@ */ function _replaceConfigurationValueSeparator() { - $custom_field_helper =& $this->Application->recallObject('InpCustomFieldsHelper'); + $custom_field_helper = $this->Application->recallObject('InpCustomFieldsHelper'); /* @var $custom_field_helper InpCustomFieldsHelper */ $sql = 'SELECT ValueList, VariableName @@ -1629,7 +1629,7 @@ WHERE FromUserId IS NOT NULL AND (FromUserId <> ' . USER_ROOT . ')'; $events = $this->Conn->Query($sql, 'EventId'); - $minput_helper =& $this->Application->recallObject('MInputHelper'); + $minput_helper = $this->Application->recallObject('MInputHelper'); /* @var $minput_helper MInputHelper */ foreach ($events as $event_id => $event_data) { @@ -1861,7 +1861,7 @@ $source_phrases = $this->getPhrasesByMask($source_prefix . '%'); $target_phrases = $this->getPhrasesByMask($target_prefix . '%'); - $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); /* @var $ml_helper kMultiLanguageHelper */ $delete_ids = Array ();