Index: install.php
===================================================================
--- install.php (revision 15130)
+++ install.php (working copy)
@@ -396,7 +396,7 @@
$next_preset = $this->Application->GetVar('next_preset');
if ($next_preset !== false) {
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$username = $this->Application->GetVar('login');
@@ -422,7 +422,7 @@
'domain' => base64_encode($_SERVER['HTTP_HOST']),
);
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$curl_helper->SetRequestData($url_params);
@@ -483,7 +483,7 @@
fwrite($fp, "Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$output = $curl_helper->Send($this->Application->BaseURL(WRITEBALE_BASE) . 'install_check.php');
@@ -684,7 +684,7 @@
case 2: // Upload License File
$file_data = array_map('trim', file($_FILES['license_file']['tmp_name']));
if ((count($file_data) == 3) && $file_data[1]) {
- $modules_helper =& $this->Application->recallObject('ModulesHelper');
+ $modules_helper = $this->Application->recallObject('ModulesHelper');
/* @var $modules_helper kModulesHelper */
if ($modules_helper->verifyLicense($file_data[1])) {
@@ -704,7 +704,7 @@
case 3: // Use Existing License
$license_hash = $this->toolkit->getSystemConfig('Intechnic', 'License');
if ($license_hash) {
- $modules_helper =& $this->Application->recallObject('ModulesHelper');
+ $modules_helper = $this->Application->recallObject('ModulesHelper');
/* @var $modules_helper kModulesHelper */
if (!$modules_helper->verifyLicense($license_hash)) {
@@ -733,7 +733,7 @@
$license_password = $this->GetVar('password');
$license_id = $this->GetVar('licenses');
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
if (strlen($license_login) && strlen($license_password) && !$license_id) {
@@ -805,7 +805,7 @@
break;
case 'select_domain':
- $modules_helper =& $this->Application->recallObject('ModulesHelper');
+ $modules_helper = $this->Application->recallObject('ModulesHelper');
/* @var $modules_helper kModulesHelper */
// get domain name as entered by user on the form
@@ -867,7 +867,7 @@
$this->toolkit->saveConfigValues($config_values);
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
// login as "root", when no errors on password screen
@@ -880,7 +880,7 @@
$this->Application->Session->SetField('Language', 1);
// set imported language as primary
- $lang =& $this->Application->recallObject('lang.-item', null, Array('skip_autoload' => true));
+ $lang = $this->Application->recallObject('lang.-item', null, Array('skip_autoload' => true));
/* @var $lang LanguagesItem */
$lang->Load(1); // fresh install => ID=1
@@ -900,7 +900,7 @@
}
// update category cache
- $updater =& $this->Application->makeClass('kPermCacheUpdater');
+ $updater = $this->Application->makeClass('kPermCacheUpdater');
/* @var $updater kPermCacheUpdater */
$updater->OneStepRun();
@@ -931,7 +931,7 @@
$theme_name = $this->Conn->GetOne($sql);
$site_path = $this->toolkit->getSystemConfig('Misc', 'WebsitePath') . '/';
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
@@ -1007,7 +1007,7 @@
}
// 3. update all theme language packs
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$themes_helper->synchronizeModule(false);
@@ -1035,10 +1035,10 @@
$this->toolkit->rebuildThemes();
// compile admin skin, so it will be available in 3 frames at once
- $skin_helper =& $this->Application->recallObject('SkinHelper');
+ $skin_helper = $this->Application->recallObject('SkinHelper');
/* @var $skin_helper SkinHelper */
- $skin =& $this->Application->recallObject('skin', null, Array ('skip_autoload' => true));
+ $skin = $this->Application->recallObject('skin', null, Array ('skip_autoload' => true));
/* @var $skin kDBItem */
$skin->Load(1, 'IsPrimary');
@@ -1067,7 +1067,7 @@
if ($this->currentStep == -1) {
// step after last step -> redirect to admin
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$user_helper->logoutUser();
Index: install/install_toolkit.php
===================================================================
--- install/install_toolkit.php (revision 15130)
+++ install/install_toolkit.php (working copy)
@@ -201,7 +201,7 @@
*/
function processLicense($file_data)
{
- $modules_helper =& $this->Application->recallObject('ModulesHelper');
+ $modules_helper = $this->Application->recallObject('ModulesHelper');
/* @var $modules_helper kModulesHelper */
$file_data = explode('Code==:', $file_data);
@@ -435,7 +435,7 @@
return ;
}
- $language_import_helper =& $this->Application->recallObject('LanguageImportHelper');
+ $language_import_helper = $this->Application->recallObject('LanguageImportHelper');
/* @var $language_import_helper LanguageImportHelper */
$language_import_helper->performImport($lang_file, '|0|1|2|', '', $upgrade ? LANG_SKIP_EXISTING : LANG_OVERWRITE_EXISTING);
@@ -683,7 +683,7 @@
return Array ();
}
- $xml_helper =& $this->Application->recallObject('kXMLHelper');
+ $xml_helper = $this->Application->recallObject('kXMLHelper');
/* @var $xml_helper kXMLHelper */
$root_node =& $xml_helper->Parse( file_get_contents($info_file) );
@@ -761,14 +761,14 @@
static $fields = null;
if ( !isset($fields) ) {
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
$fields['name'] = $ml_formatter->LangFieldName('Name');
$fields['description'] = $ml_formatter->LangFieldName('Description');
}
- $category =& $this->Application->recallObject('c', null, Array ('skip_autoload' => true));
+ $category = $this->Application->recallObject('c', null, Array ('skip_autoload' => true));
/* @var $category kDBItem */
$category_fields = Array (
@@ -796,7 +796,7 @@
$category->Create();
- $priority_helper =& $this->Application->recallObject('PriorityHelper');
+ $priority_helper = $this->Application->recallObject('PriorityHelper');
/* @var $priority_helper kPriorityHelper */
$event = new kEvent('c:OnListBuild');
@@ -869,7 +869,7 @@
$this->Application->UnitConfigReader->scanModules(MODULES_PATH . DIRECTORY_SEPARATOR . $module_folder);
// create correct columns in CustomData table
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$ml_helper->createFields($prefix . '-cdata', true);
@@ -892,7 +892,7 @@
if ( $refresh_permissions ) {
if ( $this->Application->ConfigValue('QuickCategoryPermissionRebuild') ) {
// refresh permission without progress bar
- $updater =& $this->Application->makeClass('kPermCacheUpdater');
+ $updater = $this->Application->makeClass('kPermCacheUpdater');
/* @var $updater kPermCacheUpdater */
$updater->OneStepRun();
@@ -937,7 +937,7 @@
return ;
}
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
// use direct query, since module isn't yet in kApplication::ModuleInfo array
@@ -948,7 +948,7 @@
$themes_helper->synchronizeModule($module_name);
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$ml_helper->massCreateFields();
@@ -1028,7 +1028,7 @@
return true;
}
- $primary_skin =& $this->Application->recallObject('skin.primary', null, Array ('skip_autoload' => true));
+ $primary_skin = $this->Application->recallObject('skin.primary', null, Array ('skip_autoload' => true));
/* @var $primary_skin kDBItem */
$primary_skin->Load(1, 'IsPrimary');
@@ -1038,7 +1038,7 @@
return false;
}
- $temp_handler =& $this->Application->recallObject('skin_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject('skin_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
// clone current skin
@@ -1049,7 +1049,7 @@
return false;
}
- $skin =& $this->Application->recallObject('skin.tmp', null, Array ('skip_autoload' => true));
+ $skin = $this->Application->recallObject('skin.tmp', null, Array ('skip_autoload' => true));
/* @var $skin kDBItem */
$skin->Load($cloned_ids[0]);
Index: install/step_templates/choose_modules.tpl
===================================================================
--- install/step_templates/choose_modules.tpl (revision 15111)
+++ install/step_templates/choose_modules.tpl (working copy)
@@ -26,7 +26,7 @@
$selected = Array ('core');
}
- $modules_helper =& $this->Application->recallObject('ModulesHelper');
+ $modules_helper = $this->Application->recallObject('ModulesHelper');
/* @var $modules_helper kModulesHelper */
$licensed_modules = array_map('strtolower', $modules_helper->_GetModules());
Index: install/step_templates/security.tpl
===================================================================
--- install/step_templates/security.tpl (revision 15111)
+++ install/step_templates/security.tpl (working copy)
@@ -45,7 +45,7 @@
fwrite($fp, "Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$result = $curl_helper->Send($this->Application->BaseURL(WRITEBALE_BASE) . 'install_check.php');
Index: install/upgrade_helper.php
===================================================================
--- install/upgrade_helper.php (revision 15111)
+++ install/upgrade_helper.php (working copy)
@@ -53,7 +53,7 @@
WHERE FieldName = "' . $prefix . '_ItemTemplate"';
$custom_field_id = $this->Conn->GetOne($sql);
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
$field = $ml_formatter->LangFieldName('cust_' . $custom_field_id, true);
Index: install/upgrades.php
===================================================================
--- install/upgrades.php (revision 15111)
+++ install/upgrades.php (working copy)
@@ -35,7 +35,7 @@
}
if ($mode == 'after') {
- $ml_helper =& $this->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,7 +1437,7 @@
$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');
@@ -1445,7 +1445,7 @@
$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 ();
Index: kernel/application.php
===================================================================
--- kernel/application.php (revision 15130)
+++ kernel/application.php (working copy)
@@ -320,10 +320,10 @@
$vars = kUtil::parseConfig(true);
$db_class = isset($vars['Databases']) ? 'kDBLoadBalancer' : 'kDBConnection';
- $this->Conn =& $this->Factory->makeClass($db_class, Array (SQL_TYPE, Array (&$this, 'handleSQLError')));
+ $this->Conn = $this->Factory->makeClass($db_class, Array (SQL_TYPE, Array (&$this, 'handleSQLError')));
$this->Conn->setup($vars);
- $this->cacheManager =& $this->makeClass('kCacheManager');
+ $this->cacheManager = $this->makeClass('kCacheManager');
$this->cacheManager->InitCache();
if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
@@ -331,7 +331,7 @@
}
// init config reader and all managers
- $this->UnitConfigReader =& $this->makeClass('kUnitConfigReader');
+ $this->UnitConfigReader = $this->makeClass('kUnitConfigReader');
$this->UnitConfigReader->scanModules(MODULES_PATH); // will also set RewriteListeners when existing cache is read
$this->registerModuleConstants();
@@ -343,14 +343,14 @@
define('MOD_REWRITE', $this->ConfigValue('UseModRewrite') && !$this->isAdmin ? 1 : 0);
// start processing request
- $this->HttpQuery =& $this->recallObject('HTTPQuery');
+ $this->HttpQuery = $this->recallObject('HTTPQuery');
$this->HttpQuery->process();
if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
$this->Debugger->appendTimestamp('Processed HTTPQuery initial');
}
- $this->Session =& $this->recallObject('Session');
+ $this->Session = $this->recallObject('Session');
if ( defined('DEBUG_MODE') && $this->isDebugMode() ) {
$this->Debugger->appendTimestamp('Processed Session');
@@ -398,7 +398,7 @@
$this->SetVar('visits_id', $visit_id);
}
- $language =& $this->recallObject('lang.current', null, Array ('live_table' => true));
+ $language = $this->recallObject('lang.current', null, Array ('live_table' => true));
/* @var $language LanguagesItem */
if ( preg_match('/utf-8/', $language->GetDBField('Charset')) ) {
@@ -431,9 +431,9 @@
return;
}
- $this->UrlManager =& $this->makeClass('kUrlManager');
- $this->EventManager =& $this->makeClass('EventManager');
- $this->Phrases =& $this->makeClass('kPhraseCache');
+ $this->UrlManager = $this->makeClass('kUrlManager');
+ $this->EventManager = $this->makeClass('EventManager');
+ $this->Phrases = $this->makeClass('kPhraseCache');
$this->RegisterDefaultBuildEvents();
}
@@ -478,7 +478,7 @@
}
// use makeClass over recallObject, since used before kApplication initialization during installation
- $modules_helper =& $this->makeClass('ModulesHelper');
+ $modules_helper = $this->makeClass('ModulesHelper');
/* @var $modules_helper kModulesHelper */
$this->Conn->nextQueryCachable = true;
@@ -511,7 +511,7 @@
$lang_mode = $this->GetVar('lang_mode');
$this->SetVar('lang_mode', '');
- $lang =& $this->recallObject('lang.current');
+ $lang = $this->recallObject('lang.current');
/* @var $lang kDBItem */
if ( !$lang->isLoaded() || (!$this->isAdmin && !$lang->GetDBField('Enabled')) ) {
@@ -569,7 +569,7 @@
$this->SetVar('m_theme', $theme_id);
$this->SetVar('theme.current_id', $theme_id); // KOSTJA: this is to fool theme' getPassedID
- $theme =& $this->recallObject('theme.current');
+ $theme = $this->recallObject('theme.current');
/* @var $theme ThemeItem */
if ( !$theme->isLoaded() || !$theme->GetDBField('Enabled') ) {
@@ -716,7 +716,7 @@
}
if ( !$this->siteDomain ) {
- $this->siteDomain =& $this->recallObject('site-domain.current');
+ $this->siteDomain = $this->recallObject('site-domain.current');
/* @var $site_domain kDBItem */
}
@@ -1064,7 +1064,7 @@
}
}
elseif ( $this->GetVar('admin') ) {
- $admin_session =& $this->recallObject('Session.admin');
+ $admin_session = $this->recallObject('Session.admin');
/* @var $admin_session Session */
// store Admin Console User's ID to Front-End's session for cross-session permission checks
@@ -1086,7 +1086,7 @@
$t = $this->GetVar('render_template', $this->GetVar('t'));
if ( !$this->TemplatesCache->TemplateExists($t) && !$this->isAdmin ) {
- $cms_handler =& $this->recallObject('st_EventHandler');
+ $cms_handler = $this->recallObject('st_EventHandler');
/* @var $cms_handler CategoriesEventHandler */
$t = ltrim($cms_handler->GetDesignTemplate(), '/');
@@ -1131,8 +1131,8 @@
public function InitParser($theme_name = false)
{
if ( !is_object($this->Parser) ) {
- $this->Parser =& $this->recallObject('NParser');
- $this->TemplatesCache =& $this->recallObject('TemplatesCache');
+ $this->Parser = $this->recallObject('NParser');
+ $this->TemplatesCache = $this->recallObject('TemplatesCache');
}
$this->TemplatesCache->forceThemeName = $theme_name;
@@ -1173,7 +1173,7 @@
$this->HTML = ob_get_clean() . $this->HTML;
}
- $language =& $this->recallObject('lang.current');
+ $language = $this->recallObject('lang.current');
/* @var $language LanguagesItem */
// don't replace header if some tag (e.g. XMLTemplate) already set it to something else
@@ -1333,7 +1333,7 @@
*/
public function GetSID()
{
- $session =& $this->recallObject('Session');
+ $session = $this->recallObject('Session');
/* @var $session Session */
return $session->GetID();
@@ -1348,7 +1348,7 @@
*/
public function DestroySession()
{
- $session =& $this->recallObject('Session');
+ $session = $this->recallObject('Session');
/* @var $session Session */
$session->Destroy();
@@ -1505,7 +1505,7 @@
*/
public function StoreVar($var, $val, $optional = false)
{
- $session =& $this->recallObject('Session');
+ $session = $this->recallObject('Session');
/* @var $session Session */
$this->Session->StoreVar($var, $val, $optional);
@@ -1538,7 +1538,7 @@
*/
public function StoreVarDefault($var, $val, $optional = false)
{
- $session =& $this->recallObject('Session');
+ $session = $this->recallObject('Session');
/* @var $session Session */
$this->Session->StoreVarDefault($var, $val, $optional);
@@ -1878,7 +1878,7 @@
// session expiration is called from session initialization,
// that's why $this->Session may be not defined here
- $session =& $this->recallObject('Session');
+ $session = $this->recallObject('Session');
/* @var $session Session */
$this->HandleEvent(new kEvent('adm:OnBeforeShutdown'));
@@ -1926,7 +1926,7 @@
*/
protected function ValidateLogin()
{
- $session =& $this->recallObject('Session');
+ $session = $this->recallObject('Session');
/* @var $session Session */
$user_id = $session->GetField('PortalUserId');
@@ -1948,7 +1948,7 @@
if ( $this->GetVar('expired') == 1 ) {
// this parameter is set only from admin
- $user =& $this->recallObject('u.login-admin', null, Array ('form_name' => 'login'));
+ $user = $this->recallObject('u.login-admin', null, Array ('form_name' => 'login'));
/* @var $user UsersItem */
$user->SetError('UserLogin', 'session_expired', 'la_text_sess_expired');
@@ -2102,7 +2102,7 @@
*/
public function registerAggregateTag($tag_info)
{
- $aggregator =& $this->recallObject('TagsAggregator', 'kArray');
+ $aggregator = $this->recallObject('TagsAggregator', 'kArray');
/* @var $aggregator kArray */
$tag_data = Array (
@@ -2123,16 +2123,14 @@
* @param Array $arguments
* @return kBase
*/
- public function &recallObject($name, $pseudo_class = null, $event_params = Array(), $arguments = Array ())
+ public function recallObject($name, $pseudo_class = null, $event_params = Array(), $arguments = Array ())
{
/*if ( !$this->hasObject($name) && $this->isDebugMode() && ($name == '_prefix_here_') ) {
// first time, when object with "_prefix_here_" prefix is accessed
$this->Debugger->appendTrace();
}*/
- $result =& $this->Factory->getObject($name, $pseudo_class, $event_params, $arguments);
-
- return $result;
+ return $this->Factory->getObject($name, $pseudo_class, $event_params, $arguments);
}
/**
@@ -2142,12 +2140,11 @@
* @return kDBTagProcessor
* @access public
*/
- public function &recallTagProcessor($prefix)
+ public function recallTagProcessor($prefix)
{
$this->InitParser(); // because kDBTagProcesor is in NParser dependencies
- $result =& $this->recallObject($prefix . '_TagProcessor');
- return $result;
+ return $this->recallObject($prefix . '_TagProcessor');
}
/**
@@ -2184,11 +2181,9 @@
* @return kBase
* @access public
*/
- public function &makeClass($pseudo_class, $arguments = Array ())
+ public function makeClass($pseudo_class, $arguments = Array ())
{
- $result =& $this->Factory->makeClass($pseudo_class, $arguments);
-
- return $result;
+ return $this->Factory->makeClass($pseudo_class, $arguments);
}
/**
@@ -2682,7 +2677,7 @@
*/
public function CheckPermission($name, $type = 1, $cat_id = null)
{
- $perm_helper =& $this->recallObject('PermissionsHelper');
+ $perm_helper = $this->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
return $perm_helper->CheckPermission($name, $type, $cat_id);
@@ -2699,7 +2694,7 @@
*/
public function CheckAdminPermission($name, $type = 1, $cat_id = null)
{
- $perm_helper =& $this->recallObject('PermissionsHelper');
+ $perm_helper = $this->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
return $perm_helper->CheckAdminPermission($name, $type, $cat_id);
@@ -2721,7 +2716,7 @@
return;
}
- $visit =& $this->recallObject('visits', null, Array ('raise_warnings' => 0));
+ $visit = $this->recallObject('visits', null, Array ('raise_warnings' => 0));
/* @var $visit kDBItem */
if ( $visit->isLoaded() ) {
@@ -2968,7 +2963,7 @@
*/
public function getCounter($name, $params = Array (), $query_name = null, $multiple_results = false)
{
- $count_helper =& $this->recallObject('CountHelper');
+ $count_helper = $this->recallObject('CountHelper');
/* @var $count_helper kCountHelper */
return $count_helper->getCounter($name, $params, $query_name, $multiple_results);
@@ -2987,7 +2982,7 @@
return;
}
- $count_helper =& $this->recallObject('CountHelper');
+ $count_helper = $this->recallObject('CountHelper');
/* @var $count_helper kCountHelper */
$count_helper->resetCounters($tables);
@@ -3003,7 +2998,7 @@
*/
public function XMLHeader($xml_version = false)
{
- $lang =& $this->recallObject('lang.current');
+ $lang = $this->recallObject('lang.current');
/* @var $lang LanguagesItem */
header('Content-type: text/xml; charset=' . $lang->GetDBField('Charset'));
Index: kernel/db/cat_dbitem.php
===================================================================
--- kernel/db/cat_dbitem.php (revision 15111)
+++ kernel/db/cat_dbitem.php (working copy)
@@ -282,7 +282,7 @@
WHERE ResourceId = %s';
$ids = $this->Conn->GetCol(sprintf($sql, $id_field, $this->TableName, $resource_id));
- $temp_handler =& $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems($this->Prefix, $this->Special, $ids);
@@ -312,7 +312,7 @@
*/
function stripDisallowed($filename)
{
- $filenames_helper =& $this->Application->recallObject('FilenamesHelper');
+ $filenames_helper = $this->Application->recallObject('FilenamesHelper');
/* @var $filenames_helper kFilenamesHelper */
$table = $this->IsTempTable() ? $this->Application->GetTempName(TABLE_PREFIX.'CategoryItems', 'prefix:'.$this->Prefix) : TABLE_PREFIX.'CategoryItems';
@@ -324,7 +324,7 @@
function checkAutoFilename($filename)
{
- $filenames_helper =& $this->Application->recallObject('FilenamesHelper');
+ $filenames_helper = $this->Application->recallObject('FilenamesHelper');
return $filenames_helper->checkAutoFilename($this->TableName, $this->IDField, $this->GetID(), $filename);
}*/
@@ -514,7 +514,7 @@
if ( $this->raiseEvent('OnBeforeDeleteOriginal', null, Array ('original_id' => $original_id)) ) {
// delete original item, because changes made in pending copy (this item) got to be approved in this method
- $temp_handler =& $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems($this->Prefix, $this->Special, Array ($original_id));
@@ -543,7 +543,7 @@
}
// delete this item, because changes made in pending copy (this item) will be declined in this method
- $temp_handler =& $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($this->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems($this->Prefix, $this->Special, Array ($this->GetID()));
Index: kernel/db/cat_event_handler.php
===================================================================
--- kernel/db/cat_event_handler.php (revision 15130)
+++ kernel/db/cat_event_handler.php (working copy)
@@ -59,7 +59,7 @@
$id = $this->getPassedID($event);
if ( $object->Load($id) ) {
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
@@ -99,7 +99,7 @@
if ( in_array($event->Name, $this->_getMassPermissionEvents()) ) {
$items = $this->_getPermissionCheckInfo($event);
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
if ( ($event->Name == 'OnSave') && array_key_exists(0, $items) ) {
@@ -188,7 +188,7 @@
*/
function _getPermissionCheckInfo($event)
{
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
// when saving data from temp table to live table check by data from temp table
@@ -227,7 +227,7 @@
{
$this->Application->RemoveVar('clipboard');
- $clipboard_helper =& $this->Application->recallObject('ClipboardHelper');
+ $clipboard_helper = $this->Application->recallObject('ClipboardHelper');
/* @var $clipboard_helper kClipboardHelper */
$clipboard_helper->setClipboard($event, 'copy', $this->StoreSelectedIDs($event));
@@ -244,7 +244,7 @@
protected function OnCut($event)
{
$this->Application->RemoveVar('clipboard');
- $clipboard_helper =& $this->Application->recallObject('ClipboardHelper');
+ $clipboard_helper = $this->Application->recallObject('ClipboardHelper');
/* @var $clipboard_helper kClipboardHelper */
$clipboard_helper->setClipboard($event, 'cut', $this->StoreSelectedIDs($event));
@@ -259,7 +259,7 @@
*/
function _checkPastePermission($event)
{
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$category_id = $this->Application->GetVar('m_cat_id');
@@ -292,7 +292,7 @@
}
if ( $clipboard_data['copy'] ) {
- $temp =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+ $temp = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
/* @var $temp kTempTablesHandler */
$this->Application->SetVar('ResetCatBeforeClone', 1); // used in "kCatDBEventHandler::OnBeforeClone"
@@ -300,7 +300,7 @@
}
if ( $clipboard_data['cut'] ) {
- $object =& $this->Application->recallObject($event->getPrefixSpecial() . '.item', $event->Prefix, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject($event->getPrefixSpecial() . '.item', $event->Prefix, Array ('skip_autoload' => true));
/* @var $object kCatDBItem */
foreach ($clipboard_data['cut'] as $id) {
@@ -332,12 +332,12 @@
$recycle_bin = $this->Application->ConfigValue('RecycleBinFolder');
if ( $recycle_bin ) {
- $rb =& $this->Application->recallObject('c.recycle', null, array ('skip_autoload' => true));
+ $rb = $this->Application->recallObject('c.recycle', null, array ('skip_autoload' => true));
/* @var $rb CategoriesItem */
$rb->Load($recycle_bin);
- $object =& $this->Application->recallObject($event->Prefix . '.recycleitem', null, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject($event->Prefix . '.recycleitem', null, Array ('skip_autoload' => true));
/* @var $object kCatDBItem */
foreach ($ids as $id) {
@@ -354,7 +354,7 @@
$ids = $to_delete;
}
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$event->setEventParam('ids', $ids);
@@ -486,7 +486,7 @@
$processed_prefix = $this->Application->processPrefix($prefix_special);
if ($processed_prefix['prefix'] == $related_prefix) {
// printing related categories within list of items (not on details page)
- $list =& $this->Application->recallObject($prefix_special);
+ $list = $this->Application->recallObject($prefix_special);
/* @var $list kDBList */
$id = $list->GetID();
@@ -503,7 +503,7 @@
}
}
- $p_item =& $this->Application->recallObject($related_prefix.'.current', null, Array('skip_autoload' => true));
+ $p_item = $this->Application->recallObject($related_prefix.'.current', null, Array('skip_autoload' => true));
/* @var $p_item kCatDBItem */
$p_item->Load( (int)$id );
@@ -657,7 +657,7 @@
}
else {
// for any real user itemlist view permission is checked instead of CATEGORY.VIEW
- $count_helper =& $this->Application->recallObject('CountHelper');
+ $count_helper = $this->Application->recallObject('CountHelper');
/* @var $count_helper kCountHelper */
list ($view_perm, $view_filter) = $count_helper->GetPermissionClause($event->Prefix, 'perm');
@@ -673,7 +673,7 @@
$except_types = $event->getEventParam('except');
$type_clauses = $this->getTypeClauses($event);
- $search_helper =& $this->Application->recallObject('SearchHelper');
+ $search_helper = $this->Application->recallObject('SearchHelper');
/* @var $search_helper kSearchHelper */
$search_helper->SetComplexFilter($event, $type_clauses, $types, $except_types);
@@ -753,7 +753,7 @@
$object->addCalculatedField('CachedNavbar', 'l' . $this->Application->GetVar('m_lang') . '_CachedNavbar');
if ( $event->Special == 'export' || $event->Special == 'import' ) {
- $export_helper =& $this->Application->recallObject('CatItemExportHelper');
+ $export_helper = $this->Application->recallObject('CatItemExportHelper');
/* @var $export_helper kCatDBItemExportHelper */
$export_helper->prepareExportColumns($event);
@@ -936,13 +936,13 @@
if ( !$this->Application->isAdmin ) {
// linking existing images for item with virtual fields
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
$image_helper->LoadItemImages($object);
// linking existing files for item with virtual fields
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$file_helper->LoadItemFiles($object);
@@ -976,13 +976,13 @@
/* @var $object kCatDBItem */
if ( !$this->Application->isAdmin ) {
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
// process image upload in virtual fields
$image_helper->SaveItemImages($object);
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
// process file upload in virtual fields
@@ -1036,13 +1036,13 @@
$object->assignPrimaryCategory();
if ( !$this->Application->isAdmin ) {
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
// process image upload in virtual fields
$image_helper->SaveItemImages($object);
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
// process file upload in virtual fields
@@ -1092,7 +1092,7 @@
$keywords = kUtil::unhtmlentities( trim($this->Application->GetVar('keywords')) );
- $query_object =& $this->Application->recallObject('HTTPQuery');
+ $query_object = $this->Application->recallObject('HTTPQuery');
/* @var $query_object kHTTPQuery */
$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
@@ -1223,7 +1223,7 @@
}
// keyword string processing
- $search_helper =& $this->Application->recallObject('SearchHelper');
+ $search_helper = $this->Application->recallObject('SearchHelper');
/* @var $search_helper kSearchHelper */
$where_clause = Array ();
@@ -1386,7 +1386,7 @@
*/
function OnAdvancedSearch($event)
{
- $query_object =& $this->Application->recallObject('HTTPQuery');
+ $query_object = $this->Application->recallObject('HTTPQuery');
/* @var $query_object kHTTPQuery */
if ( !isset($query_object->Post['andor']) ) {
@@ -1901,7 +1901,7 @@
$this->Application->StoreVar($event->Prefix . '_export_ids', $selected_ids ? implode(',', $selected_ids) : '');
$this->Application->StoreVar($event->Prefix . '_export_cats_ids', $selected_cats_ids);
- $export_helper =& $this->Application->recallObject('CatItemExportHelper');
+ $export_helper = $this->Application->recallObject('CatItemExportHelper');
/* @var $export_helper kCatDBItemExportHelper */
$redirect_params = Array (
@@ -1919,7 +1919,7 @@
*/
function OnExportProgress($event)
{
- $export_object =& $this->Application->recallObject('CatItemExportHelper');
+ $export_object = $this->Application->recallObject('CatItemExportHelper');
/* @var $export_object kCatDBItemExportHelper */
$event = new kEvent($event->getPrefixSpecial().':OnDummy');
@@ -1996,7 +1996,7 @@
$image_data = $object->getPrimaryImageData();
- $image =& $this->Application->recallObject('img', null, Array ('skip_autoload' => true));
+ $image = $this->Application->recallObject('img', null, Array ('skip_autoload' => true));
/* @var $image kDBItem */
if ( $image_data ) {
@@ -2059,7 +2059,7 @@
parent::OnNew($event);
if ( $event->Special == 'import' || $event->Special == 'export' ) {
- $export_helper =& $this->Application->recallObject('CatItemExportHelper');
+ $export_helper = $this->Application->recallObject('CatItemExportHelper');
/* @var $export_helper kCatDBItemExportHelper */
$export_helper->setRequiredFields($event);
@@ -2202,7 +2202,7 @@
return ;
}
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$owner_field = $this->getOwnerField($event->Prefix);
@@ -2210,7 +2210,7 @@
if ( $perm_helper->ModifyCheckPermission($object->GetDBField($owner_field), $object->GetDBField('CategoryId'), $event->Prefix) == 2 ) {
// 1. clone original item
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$cloned_ids = $temp_handler->CloneItems($event->Prefix, $event->Special, Array ($object->GetID()), null, null, null, true);
@@ -2363,7 +2363,7 @@
$object =& $event->getObject();
/* @var $object kCatDBItem */
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$primary_category = $object->GetDBField('CategoryId') > 0 ? $object->GetDBField('CategoryId') : $this->Application->GetVar('m_cat_id');
@@ -2470,15 +2470,15 @@
$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
if ($items_info) {
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$owner_field = $this->getOwnerField($event->Prefix);
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
foreach ($items_info as $id => $field_values) {
@@ -2744,7 +2744,7 @@
}
if ( !$this->Application->isAdmin ) {
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$file_helper->createItemFiles($event->Prefix, true); // create image fields
@@ -2764,7 +2764,7 @@
$this->Application->setUnitOption($this->Prefix, 'Grids', $grids);
// add options for CategoryId field (quick way to select item's primary category)
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields');
@@ -2825,7 +2825,7 @@
return ;
}
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$filename = $object->GetField($field, 'full_path');
@@ -2846,7 +2846,7 @@
return ;
}
- $rating_helper =& $this->Application->recallObject('RatingHelper');
+ $rating_helper = $this->Application->recallObject('RatingHelper');
/* @var $rating_helper RatingHelper */
$object =& $event->getObject( Array ('skip_autoload' => true) );
@@ -2876,7 +2876,7 @@
return;
}
- $spam_helper =& $this->Application->recallObject('SpamHelper');
+ $spam_helper = $this->Application->recallObject('SpamHelper');
/* @var $spam_helper SpamHelper */
$spam_helper->InitHelper($review_id, 'ReviewHelpful', strtotime('+1 month') - strtotime('now'));
Index: kernel/db/cat_tag_processor.php
===================================================================
--- kernel/db/cat_tag_processor.php (revision 15111)
+++ kernel/db/cat_tag_processor.php (working copy)
@@ -117,10 +117,10 @@
*/
function PageBrowseLink($params)
{
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
- $site_config_helper =& $this->Application->recallObject('SiteConfigHelper');
+ $site_config_helper = $this->Application->recallObject('SiteConfigHelper');
/* @var $site_config_helper SiteConfigHelper */
$settings = $site_config_helper->getSettings();
@@ -190,7 +190,7 @@
{
$prefix = $this->Prefix . '-rev';
- $review_tag_processor =& $this->Application->recallObject($prefix . '.item_TagProcessor');
+ $review_tag_processor = $this->Application->recallObject($prefix . '.item_TagProcessor');
/* @var $review_tag_processor kDBTagProcessor */
return $review_tag_processor->PrintList($params);
@@ -198,7 +198,7 @@
function ReviewCount($params)
{
- $review_tag_processor =& $this->Application->recallObject('rev.item_TagProcessor');
+ $review_tag_processor = $this->Application->recallObject('rev.item_TagProcessor');
/* @var $review_tag_processor kDBTagProcessor */
return $review_tag_processor->TotalRecords($params);
@@ -305,7 +305,7 @@
*/
function HasPermission($params)
{
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$params['raise_warnings'] = 0;
@@ -523,7 +523,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $rating_helper =& $this->Application->recallObject('RatingHelper');
+ $rating_helper = $this->Application->recallObject('RatingHelper');
/* @var $rating_helper RatingHelper */
$small_style = array_key_exists('small_style', $params) ? $params['small_style'] : false;
@@ -655,7 +655,7 @@
$format = isset($params['format']) ? $params['format'] : '_regional_DateTimeFormat';
if ( preg_match("/_regional_(.*)/", $format, $regs) ) {
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
if ( $regs[1] == 'DateTimeFormat' ) {
@@ -679,7 +679,7 @@
*/
function ItemCount($params)
{
- $count_helper =& $this->Application->recallObject('CountHelper');
+ $count_helper = $this->Application->recallObject('CountHelper');
/* @var $count_helper kCountHelper */
$today_only = isset($params['today']) && $params['today'];
@@ -698,7 +698,7 @@
$title_field = $this->Application->getUnitOption('c', 'TitleField');
$table_name = $this->Application->getUnitOption('c', 'TableName');
- $count_helper =& $this->Application->recallObject('CountHelper');
+ $count_helper = $this->Application->recallObject('CountHelper');
/* @var $count_helper kCountHelper */
list ($view_perm, $view_filter) = $count_helper->GetPermissionClause('c', 'perm_cache');
@@ -908,14 +908,14 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$perm_prefix = $this->Application->getUnitOption($this->Prefix, 'PermItemPrefix');
$categories = $perm_helper->getPermissionCategories($perm_prefix . '.' . ($object->IsNewItem() ? 'ADD' : 'MODIFY'));
}
- $json_helper =& $this->Application->recallObject('JSONHelper');
+ $json_helper = $this->Application->recallObject('JSONHelper');
/* @var $json_helper JSONHelper */
return $json_helper->encode($categories);
Index: kernel/db/db_event_handler.php
===================================================================
--- kernel/db/db_event_handler.php (revision 15130)
+++ kernel/db/db_event_handler.php (working copy)
@@ -218,10 +218,10 @@
}
if ( $event->Special == 'previous' || $event->Special == 'next' ) {
- $object =& $this->Application->recallObject($event->getEventParam('item'));
+ $object = $this->Application->recallObject($event->getEventParam('item'));
/* @var $object kDBItem */
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
$select_clause = $this->Application->getUnitOption($object->Prefix, 'NavigationSelectClause', null);
@@ -235,7 +235,7 @@
if ( preg_match('/^auto-(.*)/', $event->Special, $regs) && $this->Application->prefixRegistred($regs[1]) ) {
// - returns field DateFormat value from language (LanguageId is extracted from current phrase object)
- $main_object =& $this->Application->recallObject($regs[1]);
+ $main_object = $this->Application->recallObject($regs[1]);
/* @var $main_object kDBItem */
$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
@@ -625,7 +625,7 @@
}
}
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set($event->getPrefixSpecial() . '_GoTab', '');
@@ -642,7 +642,7 @@
*/
protected function OnTempHandlerBuild(kEvent $event)
{
- $object =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+ $object = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
/* @var $object kTempTablesHandler */
$parent_event = $event->getEventParam('parent_event');
@@ -689,7 +689,7 @@
}
if ( $object->Load($id) ) {
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
@@ -744,7 +744,7 @@
$this->SetPagination($event);
$this->SetSorting($event);
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set('remove_specials[' . $event->getPrefixSpecial() . ']', '0');
@@ -804,7 +804,7 @@
$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
if ( !$this->Application->isAdminUser ) {
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
$this->_passListParams($event, 'per_page');
@@ -841,7 +841,7 @@
{
$param_names = array_diff(Array ('page', 'per_page', 'sort_by'), Array ($skip_var));
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
foreach ($param_names as $param_name) {
@@ -1000,7 +1000,7 @@
if ( !$per_page ) {
// per page wan't found in request/session/persistent session
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
// allow to override default per-page value from tag
@@ -1224,7 +1224,7 @@
if ( $view_filter ) {
$view_filter = unserialize($view_filter);
- $temp_filter =& $this->Application->makeClass('kMultipleFilter');
+ $temp_filter = $this->Application->makeClass('kMultipleFilter');
/* @var $temp_filter kMultipleFilter */
$filter_menu = $this->Application->getUnitOption($event->Prefix, 'FilterMenu');
@@ -1393,7 +1393,7 @@
$object =& $event->getObject(Array ('main_list' => 1));
/* @var $object kDBList */
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
$this->_passListParams($event, 'sort_by');
@@ -1625,7 +1625,7 @@
return;
}
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($this->getPassedID($event)));
@@ -1645,7 +1645,7 @@
$ids = $this->Conn->GetCol($sql);
if ( $ids ) {
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems($event->Prefix, $event->Special, $ids);
@@ -1697,7 +1697,7 @@
if ( $items_info ) {
$delete_ids = Array ();
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
/* @var $temp_handler kTempTablesHandler */
foreach ($items_info as $id => $field_values) {
@@ -1732,7 +1732,7 @@
return ;
}
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
/* @var $temp_handler kTempTablesHandler */
$ids = $this->StoreSelectedIDs($event);
@@ -1788,7 +1788,7 @@
$changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
$this->Application->RemoveVar($changes_var_name);
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
/* @var $temp_handler kTempTablesHandler */
$temp_handler->PrepareEdit();
@@ -1815,7 +1815,7 @@
}
$skip_master = false;
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
/* @var $temp_handler kTempTablesHandler */
$changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
@@ -1961,7 +1961,7 @@
*/
protected function OnCancelEdit(kEvent $event)
{
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
/* @var $temp_handler kTempTablesHandler */
$temp_handler->CancelEdit();
@@ -2116,7 +2116,7 @@
$object =& $event->getObject(Array ('skip_autoload' => true));
/* @var $object kDBItem */
- $temp_handler =& $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+ $temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
/* @var $temp_handler kTempTablesHandler */
$temp_handler->PrepareEdit();
@@ -2256,7 +2256,7 @@
return;
}
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
/* @var $temp_handler kTempTablesHandler */
$ids = $this->StoreSelectedIDs($event);
@@ -2601,7 +2601,7 @@
{
$event->setPseudoClass('_List');
- $search_helper =& $this->Application->recallObject('SearchHelper');
+ $search_helper = $this->Application->recallObject('SearchHelper');
/* @var $search_helper kSearchHelper */
$search_helper->performSearch($event);
@@ -2616,7 +2616,7 @@
*/
protected function OnSearchReset(kEvent $event)
{
- $search_helper =& $this->Application->recallObject('SearchHelper');
+ $search_helper = $this->Application->recallObject('SearchHelper');
/* @var $search_helper kSearchHelper */
$search_helper->resetSearch($event);
@@ -2730,7 +2730,7 @@
if ( $resource_id ) {
$t_prefixes = explode(',', $this->Application->GetVar('translator_prefixes'));
- $cdata =& $this->Application->recallObject($t_prefixes[1], null, Array ('skip_autoload' => true));
+ $cdata = $this->Application->recallObject($t_prefixes[1], null, Array ('skip_autoload' => true));
/* @var $cdata kDBItem */
$cdata->Load($resource_id, 'ResourceId');
@@ -2850,7 +2850,7 @@
$this->Application->LinkVar('export_progress_t');
$this->Application->StoreVar('export_oroginal_special', $event->Special);
- $export_helper =& $this->Application->recallObject('CatItemExportHelper');
+ $export_helper = $this->Application->recallObject('CatItemExportHelper');
/*list ($index_file, $env) = explode('|', $this->Application->RecallVar('last_template'));
$finish_url = $this->Application->BaseURL('/admin') . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
@@ -2877,7 +2877,7 @@
protected function prepareObject(&$object, kEvent $event)
{
if ( $event->Special == 'export' || $event->Special == 'import' ) {
- $export_helper =& $this->Application->recallObject('CatItemExportHelper');
+ $export_helper = $this->Application->recallObject('CatItemExportHelper');
/* @var $export_helper kCatDBItemExportHelper */
$export_helper->prepareExportColumns($event);
@@ -2905,7 +2905,7 @@
*/
protected function OnExportBegin(kEvent $event)
{
- $export_helper =& $this->Application->recallObject('CatItemExportHelper');
+ $export_helper = $this->Application->recallObject('CatItemExportHelper');
/* @var $export_helper kCatDBItemExportHelper */
$export_helper->OnExportBegin($event);
@@ -3065,13 +3065,13 @@
return;
}
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$fname = $file_helper->ensureUniqueFilename($tmp_path, $fname);
if ( $storage_format ) {
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
move_uploaded_file($value['tmp_name'], $value['tmp_name'] . '.jpg'); // add extension, so ResizeImage can work
@@ -3123,7 +3123,7 @@
// this prevents session from auto-expiring when KeepSessionOnBrowserClose & FireFox is used
$this->Application->HttpQuery->Cookie[$cookie_name . '_live'] = $this->Application->GetVar('flashsid');
- $admin_ses =& $this->Application->recallObject('Session.admin');
+ $admin_ses = $this->Application->recallObject('Session.admin');
/* @var $admin_ses Session */
if ( $admin_ses->RecallVar('user_id') == USER_ROOT ) {
@@ -3217,7 +3217,7 @@
$url = $object->GetField($field, 'full_url'); // don't use "file_urls" format to prevent recursion
}
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$path = $file_helper->urlToPath($url);
@@ -3242,7 +3242,7 @@
*/
protected function OnValidateMInputFields(kEvent $event)
{
- $minput_helper =& $this->Application->recallObject('MInputHelper');
+ $minput_helper = $this->Application->recallObject('MInputHelper');
/* @var $minput_helper MInputHelper */
$minput_helper->OnValidateMInputFields($event);
@@ -3289,7 +3289,7 @@
$response['status'] = $object->GetErrorMsg($error_field);
}
- $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper');
+ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
/* @var $ajax_form_helper AjaxFormHelper */
$response['other_errors'] = $ajax_form_helper->getErrorMessages($object);
@@ -3359,10 +3359,10 @@
{
$event->status = kEvent::erSTOP;
- /*$lang =& $this->Application->recallObject('lang.current');
+ /*$lang = $this->Application->recallObject('lang.current');
header('Content-type: text/xml; charset=' . $lang->GetDBField('Charset'));*/
- $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
+ $picker_helper = $this->Application->recallObject('ColumnPickerHelper');
/* @var $picker_helper kColumnPickerHelper */
$picker_helper->PreparePicker($event->getPrefixSpecial(), $this->Application->GetVar('grid_name'));
Index: kernel/db/db_load_balancer.php
===================================================================
--- kernel/db/db_load_balancer.php (revision 15111)
+++ kernel/db/db_load_balancer.php (working copy)
@@ -459,7 +459,7 @@
*/
protected function &reallyOpenConnection($server, $is_master)
{
- $db =& $this->Application->makeClass( 'kDBConnection', Array ($this->dbType, $this->errorHandler, $server['serverIndex']) );
+ $db = $this->Application->makeClass( 'kDBConnection', Array ($this->dbType, $this->errorHandler, $server['serverIndex']) );
/* @var $db kDBConnection */
$db->debugMode = $this->Application->isDebugMode();
Index: kernel/db/db_tag_processor.php
===================================================================
--- kernel/db/db_tag_processor.php (revision 15111)
+++ kernel/db/db_tag_processor.php (working copy)
@@ -216,7 +216,7 @@
$grids = $this->Application->getUnitOption($this->Prefix,'Grids');
$grid_config = $grids[$params['grid']]['Fields'];
- $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
+ $picker_helper = $this->Application->recallObject('ColumnPickerHelper');
/* @var $picker_helper kColumnPickerHelper */
$picker_helper->ApplyPicker($this->getPrefixSpecial(), $grid_config, $params['grid']);
@@ -264,7 +264,7 @@
function PickerCRC($params)
{
/* @var $picker_helper kColumnPickerHelper */
- $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
+ $picker_helper = $this->Application->recallObject('ColumnPickerHelper');
$picker_helper->SetGridName($params['grid']);
$data = $picker_helper->LoadColumns($this->getPrefixSpecial());
return $data['crc'];
@@ -273,7 +273,7 @@
function FreezerPosition($params)
{
/* @var $picker_helper kColumnPickerHelper */
- $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
+ $picker_helper = $this->Application->recallObject('ColumnPickerHelper');
$picker_helper->SetGridName($params['grid']);
$data = $picker_helper->LoadColumns($this->getPrefixSpecial());
$freezer_pos = array_search('__FREEZER__', $data['order']);
@@ -378,7 +378,7 @@
$prefix_special = rtrim($this->Prefix . '.' . $special, '.');
$params['skip_counting'] = true;
- $list =& $this->Application->recallObject($prefix_special, $this->Prefix . '_List', $params);
+ $list = $this->Application->recallObject($prefix_special, $this->Prefix . '_List', $params);
/* @var $list kDBList */
if ( !array_key_exists('skip_quering', $params) || !$params['skip_quering'] ) {
@@ -551,7 +551,7 @@
if ( $this->Special && $this->Application->hasObject($this->Prefix) ) {
// object, produced by "kDBList::linkToParent" method, that otherwise would keep it's id
- $item =& $this->Application->recallObject($this->Prefix);
+ $item = $this->Application->recallObject($this->Prefix);
/* @var $item kDBBase */
if ( $item instanceof kDBItem ) {
@@ -611,7 +611,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
$select_clause = $this->Application->getUnitOption($object->Prefix, 'NavigationSelectClause', null);
@@ -632,7 +632,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
$select_clause = $this->Application->getUnitOption($object->Prefix, 'NavigationSelectClause', null);
@@ -734,7 +734,7 @@
list ($prefix, ) = explode('.', $prefix_special);
if (!array_key_exists($prefix, $default_per_page)) {
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
$default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix);
@@ -823,7 +823,7 @@
*/
function ConvertCurrency($value, $iso)
{
- $converter =& $this->Application->recallObject('CurrencyRates');
+ $converter = $this->Application->recallObject('CurrencyRates');
/* @var $converter CurrencyRates */
return $converter->Convert($value, 'PRIMARY', $iso);
@@ -849,7 +849,7 @@
if ( $decimal_tag ) {
if ( $decimal_separator === false ) {
- $language =& $this->Application->recallObject('lang.current');
+ $language = $this->Application->recallObject('lang.current');
/* @var $language LanguagesItem */
$decimal_separator = $language->GetDBField('DecimalPoint');
@@ -1019,7 +1019,7 @@
$format = array_key_exists('format', $params) ? $params['format'] : false;
if (preg_match('/_regional_(.*)/', $format, $regs)) {
- $language =& $this->Application->recallObject('lang.current');
+ $language = $this->Application->recallObject('lang.current');
/* @var $language kDBItem */
$format = $language->GetDBField($regs[1]);
@@ -1059,7 +1059,7 @@
$dst_field = $this->SelectParam($params, 'name,field');
list($prefix_special, $src_field) = explode(':', $params['src']);
- $src_object =& $this->Application->recallObject($prefix_special);
+ $src_object = $this->Application->recallObject($prefix_special);
/* @var $src_object kDBItem */
$object->SetDBField($dst_field, $src_object->GetDBField($src_field));
@@ -1145,7 +1145,7 @@
$formatter_class = $object->GetFieldOption($field, 'formatter');
if ( $formatter_class == 'kMultiLanguage' ) {
- $formatter =& $this->Application->recallObject($formatter_class);
+ $formatter = $this->Application->recallObject($formatter_class);
/* @var $formatter kMultiLanguage */
$field = $formatter->LangFieldName($field);
@@ -1281,7 +1281,7 @@
$formatter_class = array_key_exists('formatter', $options) ? $options['formatter'] : false;
if ( $formatter_class ) {
- $formatter =& $this->Application->recallObject($formatter_class);
+ $formatter = $this->Application->recallObject($formatter_class);
/* @var $formatter kFormatter */
$human_format = array_key_exists('human', $params) ? $params['human'] : false;
@@ -1539,7 +1539,7 @@
$formatter_class = $object->GetFieldOption($field, 'formatter');
if ($formatter_class == 'kMultiLanguage') {
- $formatter =& $this->Application->recallObject($formatter_class);
+ $formatter = $this->Application->recallObject($formatter_class);
/* @var $formatter kMultiLanguage */
$force_primary = $object->GetFieldOption($field, 'force_primary');
@@ -1664,7 +1664,7 @@
{
$list =& $this->GetList($params);
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
return $list_helper->hasUserSorting($list);
@@ -1954,7 +1954,7 @@
}
$tag_params = array_merge($params, $tag_params);
- $objects[ $prefix_data['prefix_special'] ] =& $this->Application->recallObject($prefix_data['prefix_special'], $prefix_data['prefix'], $tag_params);
+ $objects[ $prefix_data['prefix_special'] ] = $this->Application->recallObject($prefix_data['prefix_special'], $prefix_data['prefix'], $tag_params);
$object_status[ $prefix_data['prefix_special'] ] = $objects[ $prefix_data['prefix_special'] ]->IsNewItem() ? 'new' : 'edit';
// a. set object's status field (adding item/editing item) for each object in title
@@ -1975,7 +1975,7 @@
// replace to section title
$section = array_key_exists('section', $params) ? $params['section'] : false;
if ($section) {
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($section);
@@ -2092,7 +2092,7 @@
$field = $params['field'];
- $helper =& $this->Application->recallObject('InpCustomFieldsHelper');
+ $helper = $this->Application->recallObject('InpCustomFieldsHelper');
/* @var $helper InpCustomFieldsHelper */
$element_type = $object->GetDBField($params['element_type_field']);
@@ -2290,7 +2290,7 @@
$formatter_class = $object->GetFieldOption($field, 'formatter');
if ( $formatter_class ) {
- $formatter =& $this->Application->recallObject($formatter_class);
+ $formatter = $this->Application->recallObject($formatter_class);
/* @var $formatter kFormatter */
$ret = $formatter->Format($ret, $field, $object);
@@ -2351,7 +2351,7 @@
$this->Application->RemoveVar($error_var_name);
}
- $object =& $this->Application->recallObject($this->Prefix . '.' . $this->Special . '-item', null, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject($this->Prefix . '.' . $this->Special . '-item', null, Array ('skip_autoload' => true));
/* @var $object kDBItem */
$object->SetError($field, $pseudo);
@@ -2367,7 +2367,7 @@
*/
function &getObject($params = Array())
{
- $object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
+ $object = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params);
/* @var $object kDBItem */
if ( isset($params['requery']) && $params['requery'] ) {
@@ -2424,7 +2424,7 @@
*/
function ExportStatus($params)
{
- $export_object =& $this->Application->recallObject('CatItemExportHelper');
+ $export_object = $this->Application->recallObject('CatItemExportHelper');
/* @var $export_object kCatDBItemExportHelper */
$event = new kEvent($this->getPrefixSpecial().':OnDummy');
@@ -2612,7 +2612,7 @@
);
if ( file_exists(SYSTEM_PRESET_PATH . DIRECTORY_SEPARATOR . 'inp_ckconfig.js') ) {
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$config_js = $file_helper->pathToUrl(SYSTEM_PRESET_PATH . DIRECTORY_SEPARATOR . 'inp_ckconfig.js');
@@ -2885,7 +2885,7 @@
*/
function RangeFiltersUsed($params)
{
- $search_helper =& $this->Application->recallObject('SearchHelper');
+ $search_helper = $this->Application->recallObject('SearchHelper');
/* @var $search_helper kSearchHelper */
return $search_helper->rangeFiltersUsed($this->getPrefixSpecial(), $params['grid']);
Index: kernel/db/dbitem.php
===================================================================
--- kernel/db/dbitem.php (revision 15130)
+++ kernel/db/dbitem.php (working copy)
@@ -92,7 +92,7 @@
if ( !is_object($this->validator) ) {
$validator_class = $this->Application->getUnitOption($this->Prefix, 'ValidatorClass', 'kValidator');
- $this->validator =& $this->Application->makeClass($validator_class);
+ $this->validator = $this->Application->makeClass($validator_class);
}
$this->validator->setDataSource($this);
@@ -127,7 +127,7 @@
$formatter = $this->GetFieldOption($field_name, 'formatter');
if ( $formatter ) {
- $formatter =& $this->Application->recallObject($formatter);
+ $formatter = $this->Application->recallObject($formatter);
/* @var $formatter kFormatter */
$res = $formatter->Format($value, $field_name, $this, $format);
@@ -185,7 +185,7 @@
// kFormatter is always used, to make sure, that numeric value is converted to normal representation
// according to regional format, even when formatter is not set (try seting format to 1.234,56 to understand why)
- $formatter =& $this->Application->recallObject(isset($options['formatter']) ? $options['formatter'] : 'kFormatter');
+ $formatter = $this->Application->recallObject(isset($options['formatter']) ? $options['formatter'] : 'kFormatter');
/* @var $formatter kFormatter */
$parsed = $formatter->Parse($value, $name, $this);
@@ -518,7 +518,7 @@
foreach ($this->Fields as $field => $options) {
if ( isset($options['formatter']) ) {
- $formatter =& $this->Application->recallObject($options['formatter']);
+ $formatter = $this->Application->recallObject($options['formatter']);
/* @var $formatter kFormatter */
$formatter->UpdateMasterFields($field, $this->GetDBField($field), $options, $this);
@@ -1041,7 +1041,7 @@
$this->LogChanges($main_prefix, $mode);
if (!$this->IsTempTable()) {
- $handler =& $this->Application->recallObject($this->Prefix . '_EventHandler');
+ $handler = $this->Application->recallObject($this->Prefix . '_EventHandler');
/* @var $handler kDBEventHandler */
$ses_var_name = $main_prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
@@ -1371,17 +1371,17 @@
$cdata_key = rtrim($this->Prefix . '-cdata.' . $this->Special, '.');
- $cdata =& $this->Application->recallObject($cdata_key, null, Array ('skip_autoload' => true));
+ $cdata = $this->Application->recallObject($cdata_key, null, Array ('skip_autoload' => true));
/* @var $cdata kDBItem */
$resource_id = $this->GetDBField('ResourceId');
$cdata->Load($resource_id, 'ResourceId');
$cdata->SetDBField('ResourceId', $resource_id);
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$languages = $ml_helper->getLanguages();
Index: kernel/db/dblist.php
===================================================================
--- kernel/db/dblist.php (revision 15130)
+++ kernel/db/dblist.php (working copy)
@@ -266,7 +266,7 @@
foreach ($filters as $filter_params) {
$filter =& $this->$filter_params['type'];
- $filter[ $filter_params['class'] ] =& $this->Application->makeClass('kMultipleFilter', Array ($filter_params['join_using']));
+ $filter[ $filter_params['class'] ] = $this->Application->makeClass('kMultipleFilter', Array ($filter_params['join_using']));
}
$this->PerPage = -1;
@@ -668,7 +668,7 @@
$formatter_class = $this->GetFieldOption($field, 'formatter');
if ( $formatter_class ) {
- $formatter =& $this->Application->recallObject($formatter_class);
+ $formatter = $this->Application->recallObject($formatter_class);
/* @var $formatter kFormatter */
$res = $formatter->Format($res, $field, $this);
@@ -742,7 +742,7 @@
*/
private function GetWhereClause($for_counting=false,$system_filters_only=false)
{
- $where =& $this->Application->makeClass('kMultipleFilter');
+ $where = $this->Application->makeClass('kMultipleFilter');
/* @var $where kMultipleFilter */
$where->addFilter('system_where', $this->WhereFilter[self::FLT_SYSTEM] );
@@ -789,7 +789,7 @@
private function GetHavingClause($for_counting=false, $system_filters_only=false, $aggregated = 0)
{
if ($for_counting) {
- $aggregate_filter =& $this->Application->makeClass('kMultipleFilter');
+ $aggregate_filter = $this->Application->makeClass('kMultipleFilter');
/* @var $aggregate_filter kMultipleFilter */
$aggregate_filter->addFilter('aggregate_system', $this->AggregateFilter[kDBList::FLT_SYSTEM]);
@@ -799,7 +799,7 @@
return $this->extractCalculatedFields($aggregate_filter->getSQL(), 2);
}
- $having =& $this->Application->makeClass('kMultipleFilter');
+ $having = $this->Application->makeClass('kMultipleFilter');
/* @var $having kMultipleFilter */
$having->addFilter('system_having', $this->HavingFilter[kDBList::FLT_SYSTEM] );
@@ -1308,7 +1308,7 @@
return ;
}
- $parent_object =& $this->Application->recallObject($parent_prefix.'.'.$special);
+ $parent_object = $this->Application->recallObject($parent_prefix.'.'.$special);
/* @var $parent_object kDBItem */
if (!$parent_object->isLoaded()) {
@@ -1350,7 +1350,7 @@
$ret = Array ();
if ($formatted && array_key_exists('formatter', $this->Fields[$field])) {
- $formatter =& $this->Application->recallObject($this->Fields[$field]['formatter']);
+ $formatter = $this->Application->recallObject($this->Fields[$field]['formatter']);
/* @var $formatter kFormatter */
while ($i < $this->SelectedCount) {
Index: kernel/event_handler.php
===================================================================
--- kernel/event_handler.php (revision 15130)
+++ kernel/event_handler.php (working copy)
@@ -176,7 +176,7 @@
*/
public function CheckPermission(kEvent $event)
{
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
return $perm_helper->CheckEventPermission($event, $this->permMapping);
Index: kernel/event_manager.php
===================================================================
--- kernel/event_manager.php (revision 15130)
+++ kernel/event_manager.php (working copy)
@@ -65,9 +65,9 @@
{
parent::__construct();
- $this->Hooks =& $this->Application->makeClass('kHookManager');
- $this->ScheduledTasks =& $this->Application->makeClass('kScheduledTaskManager');
- $this->Request =& $this->Application->makeClass('kRequestManager');
+ $this->Hooks = $this->Application->makeClass('kHookManager');
+ $this->ScheduledTasks = $this->Application->makeClass('kScheduledTaskManager');
+ $this->Request = $this->Application->makeClass('kRequestManager');
}
/**
@@ -255,7 +255,7 @@
}
}
- $event_handler =& $this->Application->recallObject($event->Prefix . '_EventHandler');
+ $event_handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
/* @var $event_handler kEventHandler */
$event_handler->processEvent($event);
@@ -333,7 +333,7 @@
*/
public function setEvent($prefix_special,$event_name)
{
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set('events[' . $prefix_special . ']', $event_name);
Index: kernel/globals.php
===================================================================
--- kernel/globals.php (revision 15111)
+++ kernel/globals.php (working copy)
@@ -332,7 +332,7 @@
{
$application =& kApplication::Instance();
- $curl_helper =& $application->recallObject('CurlHelper');
+ $curl_helper = $application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
if ($request_type == 'POST') {
Index: kernel/kbase.php
===================================================================
--- kernel/kbase.php (revision 15130)
+++ kernel/kbase.php (working copy)
@@ -851,7 +851,7 @@
if ( $formatter_class ) {
$value = ($formatter_class == 'kMultiLanguage') && !preg_match('/^l[0-9]+_/', $name) ? '' : $this->GetDBField($name);
- $formatter =& $this->Application->recallObject($formatter_class);
+ $formatter = $this->Application->recallObject($formatter_class);
/* @var $formatter kFormatter */
return $formatter->Format($value, $name, $this, $format);
@@ -901,7 +901,7 @@
foreach ($fields as $field) {
if ( isset($this->Fields[$field]['formatter']) ) {
- $formatter =& $this->Application->recallObject($this->Fields[$field]['formatter']);
+ $formatter = $this->Application->recallObject($this->Fields[$field]['formatter']);
/* @var $formatter kFormatter */
$formatter->UpdateSubFields($field, $this->GetDBField($field), $this->Fields[$field], $this);
@@ -923,7 +923,7 @@
continue;
}
- $formatter =& $this->Application->recallObject( $this->Fields[$field_name]['formatter'] );
+ $formatter = $this->Application->recallObject( $this->Fields[$field_name]['formatter'] );
/* @var $formatter kFormatter */
$formatter->PrepareOptions($field_name, $this->Fields[$field_name], $this);
@@ -1051,11 +1051,11 @@
$table_info['ParentTableKey'] = getArrayValue($table_info, 'ParentTableKey', $parent_prefix);
}
- $main_object =& $this->Application->recallObject($parent_prefix.'.'.$special, null, Array ('raise_warnings' => 0));
+ $main_object = $this->Application->recallObject($parent_prefix.'.'.$special, null, Array ('raise_warnings' => 0));
/* @var $main_object kDBItem */
if (!$main_object->isLoaded() && $guess_special) {
- $main_object =& $this->Application->recallObject($parent_prefix);
+ $main_object = $this->Application->recallObject($parent_prefix);
}
return array_merge($table_info, Array('ParentId'=> $main_object->GetDBField( $table_info['ParentTableKey'] ) ) );
Index: kernel/languages/phrases_cache.php
===================================================================
--- kernel/languages/phrases_cache.php (revision 15111)
+++ kernel/languages/phrases_cache.php (working copy)
@@ -153,7 +153,7 @@
$this->LanguageId = $language_id;
if (!$this->Application->isAdmin && $this->Application->GetVar('admin')) {
- $admin_session =& $this->Application->recallObject('Session.admin');
+ $admin_session = $this->Application->recallObject('Session.admin');
/* @var $admin_session Session */
$this->AdminLanguageId = $admin_session->GetField('Language');
Index: kernel/managers/cache_manager.php
===================================================================
--- kernel/managers/cache_manager.php (revision 15130)
+++ kernel/managers/cache_manager.php (working copy)
@@ -97,7 +97,7 @@
*/
public function InitCache()
{
- $this->cacheHandler =& $this->Application->makeClass('kCache');
+ $this->cacheHandler = $this->Application->makeClass('kCache');
}
/**
@@ -282,7 +282,7 @@
$this->Application->setFromCache($cache);
- $aggregator =& $this->Application->recallObject('TagsAggregator', 'kArray');
+ $aggregator = $this->Application->recallObject('TagsAggregator', 'kArray');
/* @var $aggregator kArray */
$aggregator->setFromCache($cache);
@@ -336,7 +336,7 @@
*/
public function UpdateUnitCache()
{
- $aggregator =& $this->Application->recallObject('TagsAggregator', 'kArray');
+ $aggregator = $this->Application->recallObject('TagsAggregator', 'kArray');
/* @var $aggregator kArray */
$this->preloadConfigVars(); // preloading will put to cache
Index: kernel/managers/plain_url_processor.php
===================================================================
--- kernel/managers/plain_url_processor.php (revision 15111)
+++ kernel/managers/plain_url_processor.php (working copy)
@@ -118,7 +118,7 @@
$vars = Array ();
$prefix_special = array_shift($mixed_part); // l.pick, l
- $http_query =& $this->Application->recallObject('HTTPQuery');
+ $http_query = $this->Application->recallObject('HTTPQuery');
/* @var $http_query kHTTPQuery */
$query_map = $http_query->discoverUnit($prefix_special); // from $_GET['env']
@@ -157,7 +157,7 @@
}
}
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
/* @var $session Session */
$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : 0;
Index: kernel/managers/request_manager.php
===================================================================
--- kernel/managers/request_manager.php (revision 15130)
+++ kernel/managers/request_manager.php (working copy)
@@ -153,7 +153,7 @@
$event->SetRedirectParam('opener', 's'); // stay on same page after event is called
$event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true));
- $event_handler =& $this->Application->recallObject($event->Prefix . '_EventHandler');
+ $event_handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
/* @var $event_handler kEventHandler */
if ( ($this->Application->RecallVar('user_id') == USER_ROOT) || $event_handler->CheckPermission($event) ) {
@@ -175,7 +175,7 @@
$event->redirect = $this->Application->isAdmin ? 'no_permission' : $this->Application->ConfigValue('NoPermissionTemplate');
$event->SetRedirectParam('pass', 'm');
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$event->SetRedirectParam( 'm_cat_id', $themes_helper->getPageByTemplate($event->redirect) );
@@ -319,7 +319,7 @@
*/
protected function processOpener()
{
- $opener_stack =& $this->Application->makeClass('kOpenerStack');
+ $opener_stack = $this->Application->makeClass('kOpenerStack');
/* @var $opener_stack kOpenerStack */
switch ( $this->Application->GetVar('m_opener') ) {
@@ -330,7 +330,7 @@
case 'd':
// "down/push" new template to opener stack, deeplevel++
if ( $this->Application->GetVar('front') ) {
- $front_session =& $this->Application->recallObject('Session.front');
+ $front_session = $this->Application->recallObject('Session.front');
/* @var $front_session Session */
$opener_stack->pushRaw( '../' . $front_session->RecallVar('last_template') );
@@ -352,7 +352,7 @@
$this->Application->StoreVar('last_wid', $popup_wid);
$this->Application->SetVar('m_wid', $popup_wid);
- $popup_opener_stack =& $this->Application->makeClass('kOpenerStack', Array ($popup_wid));
+ $popup_opener_stack = $this->Application->makeClass('kOpenerStack', Array ($popup_wid));
/* @var $popup_opener_stack kOpenerStack */
$popup_opener_stack->pushRaw( $this->getLastTemplate($parent_wid) );
@@ -387,7 +387,7 @@
protected function getLastTemplate($window_id)
{
if ( $this->Application->GetVar('front') ) {
- $front_session =& $this->Application->recallObject('Session.front');
+ $front_session = $this->Application->recallObject('Session.front');
/* @var $front_session Session */
return '../' . $front_session->RecallVar( rtrim('last_template_popup_' . $window_id, '_') );
@@ -395,7 +395,7 @@
if ( $this->Application->GetVar('merge_opener_stack') ) {
// get last template from parent (that was closed) window opener stack
- $parent_opener_stack =& $this->Application->makeClass('kOpenerStack', Array ($window_id));
+ $parent_opener_stack = $this->Application->makeClass('kOpenerStack', Array ($window_id));
/* @var $parent_opener_stack kOpenerStack */
$last_template = $parent_opener_stack->pop(true);
@@ -427,7 +427,7 @@
$window_relations = $window_relations ? unserialize($window_relations) : Array ();
$wid = isset($window_relations[$wid]) ? $window_relations[$wid] : false;*/
- $opener_stack =& $this->Application->makeClass('kOpenerStack', Array ($wid));
+ $opener_stack = $this->Application->makeClass('kOpenerStack', Array ($wid));
/* @var $opener_stack kOpenerStack */
// change opener stack
@@ -459,7 +459,7 @@
*/
protected function openerStackChange($new_template = null, $new_params = null)
{
- $opener_stack =& $this->Application->makeClass('kOpenerStack');
+ $opener_stack = $this->Application->makeClass('kOpenerStack');
/* @var $opener_stack kOpenerStack */
list ($template, $params, $index_file) = $opener_stack->pop();
Index: kernel/managers/rewrite_url_processor.php
===================================================================
--- kernel/managers/rewrite_url_processor.php (revision 15111)
+++ kernel/managers/rewrite_url_processor.php (working copy)
@@ -90,7 +90,7 @@
{
parent::__construct($manager);
- $this->HTTPQuery =& $this->Application->recallObject('HTTPQuery');
+ $this->HTTPQuery = $this->Application->recallObject('HTTPQuery');
// domain based primary language
$this->primaryLanguageId = $this->Application->siteDomainField('PrimaryLanguageId');
@@ -292,7 +292,7 @@
// don't use temp variable, since it will swap objects in Factory in PHP5
$this->rewriteListeners[$prefix][$index] = Array ();
- $this->rewriteListeners[$prefix][$index][0] =& $this->Application->recallObject($listener_prefix);
+ $this->rewriteListeners[$prefix][$index][0] = $this->Application->recallObject($listener_prefix);
$this->rewriteListeners[$prefix][$index][1] = $listener_method;
}
}
@@ -574,7 +574,7 @@
return false;
}
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
do {
@@ -710,7 +710,7 @@
if ( !isset($this->_templateAliases) ) {
// when empty url OR mod-rewrite disabled
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$sql = 'SELECT TemplateAliases
Index: kernel/managers/scheduled_task_manager.php
===================================================================
--- kernel/managers/scheduled_task_manager.php (revision 15111)
+++ kernel/managers/scheduled_task_manager.php (working copy)
@@ -113,7 +113,7 @@
$user_id = $this->Application->RecallVar('user_id');
$this->Application->StoreVar('user_id', USER_ROOT, true); // to prevent permission checking inside events, true for optional storage
- $site_helper =& $this->Application->recallObject('SiteHelper');
+ $site_helper = $this->Application->recallObject('SiteHelper');
/* @var $site_helper SiteHelper */
$site_domain_id = $site_helper->getDomainByName('DomainName', DOMAIN);
Index: kernel/managers/url_manager.php
===================================================================
--- kernel/managers/url_manager.php (revision 15111)
+++ kernel/managers/url_manager.php (working copy)
@@ -55,7 +55,7 @@
parent::__construct();
// don't use kApplication::recallObject, since it will call kApplication::EventManager, which isn't ready yet
- $this->plain =& $this->Application->makeClass('kPlainUrlProcessor', Array (&$this));
+ $this->plain = $this->Application->makeClass('kPlainUrlProcessor', Array (&$this));
}
/**
@@ -70,7 +70,7 @@
return;
}
- $this->rewrite =& $this->Application->recallObject('kRewriteUrlProcessor', null, Array (), Array (&$this));
+ $this->rewrite = $this->Application->recallObject('kRewriteUrlProcessor', null, Array (), Array (&$this));
$this->rewriteReady = true;
}
@@ -139,7 +139,7 @@
$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : null;
if ( $ssl !== null ) {
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
/* @var $session Session */
$target_url = rtrim($this->Application->BaseURL('', $ssl, false), '/');
@@ -212,7 +212,7 @@
$this->initRewrite();
}
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
if ( $session->NeedQueryString() && !$force_no_sid ) {
$params['sid'] = $this->Application->GetSID();
@@ -240,7 +240,7 @@
*/
protected function processPopupClose($prefix = '', $params = Array ())
{
- $opener_stack =& $this->Application->makeClass('kOpenerStack');
+ $opener_stack = $this->Application->makeClass('kOpenerStack');
/* @var $opener_stack kOpenerStack */
if ( $opener_stack->isEmpty() ) {
@@ -390,7 +390,7 @@
public function LoadStructureTemplateMapping()
{
if (!$this->Application->isAdmin) {
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
$this->structureTemplateMapping = $category_helper->getTemplateMapping();
@@ -436,7 +436,7 @@
$not_found = $this->Application->ConfigValue('ErrorTemplate');
$vars['t'] = $not_found ? $not_found : 'error_notfound';
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$vars['m_cat_id'] = $themes_helper->getPageByTemplate($vars['t'], $theme_id);
Index: kernel/nparser/nparser.php
===================================================================
--- kernel/nparser/nparser.php (revision 15111)
+++ kernel/nparser/nparser.php (working copy)
@@ -473,7 +473,7 @@
function &RunMainPage($pre_parsed)
{
- $page =& $this->Application->recallObject('st.-virtual');
+ $page = $this->Application->recallObject('st.-virtual');
/* @var $page kDBItem */
if ($page->isLoaded()) {
@@ -1177,7 +1177,7 @@
*/
function CompressScript($data, $raw_script = false, $file_extension = '')
{
- $minify_helper =& $this->Application->recallObject('MinifyHelper');
+ $minify_helper = $this->Application->recallObject('MinifyHelper');
/* @var $minify_helper MinifyHelper */
if ($raw_script) {
Index: kernel/processors/main_processor.php
===================================================================
--- kernel/processors/main_processor.php (revision 15111)
+++ kernel/processors/main_processor.php (working copy)
@@ -20,7 +20,7 @@
{
parent::__construct();
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set('t', $this->Application->GetVar('t'));
@@ -191,7 +191,7 @@
$name = $params['name'];
$method = $params['method'];
- $tmp =& $this->Application->recallObject($name);
+ $tmp = $this->Application->recallObject($name);
if ($tmp != null) {
if (method_exists($tmp, $method))
return $tmp->$method($params);
@@ -448,7 +448,7 @@
$value_list = $this->Conn->GetOne($sql);
if ( $value_list ) {
- $helper =& $this->Application->recallObject('InpCustomFieldsHelper');
+ $helper = $this->Application->recallObject('InpCustomFieldsHelper');
/* @var $helper InpCustomFieldsHelper */
$options = $helper->GetValuesHash($value_list);
@@ -488,7 +488,7 @@
*/
protected function DumpSystemInfo($params)
{
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set('t', $this->Application->GetVar('t'));
@@ -517,7 +517,7 @@
$form_fields = Array ();
if ( $this->Application->RewriteURLs() ) {
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
/* @var $session Session */
if ( $session->NeedQueryString() ) {
@@ -584,13 +584,13 @@
$phrase_key = mb_strtoupper($phrase_name);
if ( $default_translation && strpos($translation, '!' . $phrase_key . '!') !== false ) {
- $phrase =& $this->Application->recallObject('phrases.autocreate', null, Array ('skip_autoload' => true));
+ $phrase = $this->Application->recallObject('phrases.autocreate', null, Array ('skip_autoload' => true));
/* @var $phrase kDBItem */
if ( !$phrase->Load($phrase_key, 'PhraseKey') ) {
$phrase->SetDBField('Phrase', $phrase_name);
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$languages = $ml_helper->getLanguages();
@@ -823,7 +823,7 @@
*/
function CheckPermission($params)
{
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
return $perm_helper->TagPermissionCheck($params);
@@ -848,7 +848,7 @@
(isset($params['perm_prefix']) && $params['perm_prefix']) ||
(isset($params['permissions']) && $params['permissions'])) {
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$perm_status = $perm_helper->TagPermissionCheck($params);
@@ -986,7 +986,7 @@
$require = $this->Application->ConfigValue('Require_AdminSSL');
}
- $http_query =& $this->Application->recallObject('HTTPQuery');
+ $http_query = $this->Application->recallObject('HTTPQuery');
/* @var $http_query kHTTPQuery */
$pass = $http_query->getRedirectParams();
@@ -1064,7 +1064,7 @@
return $this->Application->XMLHeader(getArrayValue($params, 'xml_version'));
}
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
header('Content-type: text/html; charset=' . $lang->GetDBField('Charset'));
@@ -1131,7 +1131,7 @@
$path = FULL_PATH . '/' . $params['path'];
$pseudo = isset($params['special']) ? 'EmailSender.' . $params['special'] : 'EmailSender';
- $esender =& $this->Application->recallObject($pseudo);
+ $esender = $this->Application->recallObject($pseudo);
/* @var $esender kEmailSendingHelper */
if ( file_exists($path) ) {
@@ -1144,7 +1144,7 @@
$this->NoDebug($params);
$this->Application->SetVar('skip_last_template', 1);
- $captcha_helper =& $this->Application->recallObject('CaptchaHelper');
+ $captcha_helper = $this->Application->recallObject('CaptchaHelper');
/* @var $captcha_helper kCaptchaHelper */
// generate captcha code
Index: kernel/processors/tag_processor.php
===================================================================
--- kernel/processors/tag_processor.php (revision 15111)
+++ kernel/processors/tag_processor.php (working copy)
@@ -62,7 +62,7 @@
}
if ( $this->Application->hasObject('TagsAggregator') ) {
- $aggregator =& $this->Application->recallObject('TagsAggregator');
+ $aggregator = $this->Application->recallObject('TagsAggregator');
/* @var $aggregator kArray */
$tmp = $this->Application->processPrefix($prefix);
@@ -149,7 +149,7 @@
{
if ( $this->Application->hasObject('TagsAggregator') ) {
$Method = $tag;
- $aggregator =& $this->Application->recallObject('TagsAggregator');
+ $aggregator = $this->Application->recallObject('TagsAggregator');
/* @var $aggregator kArray */
$tmp = $this->Application->processPrefix($prefix);
@@ -160,7 +160,7 @@
$tmp = $this->Application->processPrefix($tag_mapping[0]);
$__tag_processor = $tmp['prefix'] . '_TagProcessor';
- $processor =& $this->Application->recallObject($__tag_processor);
+ $processor = $this->Application->recallObject($__tag_processor);
/* @var $processor kTagProcessor */
$processor->Init($tmp['prefix'], getArrayValue($tag_mapping, 2) ? $tag_mapping[2] : $tmp['special']);
Index: kernel/session/session.php
===================================================================
--- kernel/session/session.php (revision 15130)
+++ kernel/session/session.php (working copy)
@@ -239,7 +239,7 @@
function InitStorage($special)
{
- $this->Storage =& $this->Application->recallObject('SessionStorage.'.$special);
+ $this->Storage = $this->Application->recallObject('SessionStorage.'.$special);
$this->Storage->setSession($this);
}
@@ -328,7 +328,7 @@
return false;
}
- $http_query =& $this->Application->recallObject('HTTPQuery');
+ $http_query = $this->Application->recallObject('HTTPQuery');
/* @var $http_query kHTTPQuery */
$cookies_on = array_key_exists('cookies_on', $http_query->Cookie); // not good here
@@ -445,7 +445,7 @@
function getFlashSID()
{
- $http_query =& $this->Application->recallObject('HTTPQuery');
+ $http_query = $this->Application->recallObject('HTTPQuery');
/* @var $http_query kHTTPQuery */
return getArrayValue($http_query->Post, 'flashsid');
@@ -461,7 +461,7 @@
$get_sid = $this->getFlashSID();
if (!$get_sid) {
- $http_query =& $this->Application->recallObject('HTTPQuery');
+ $http_query = $this->Application->recallObject('HTTPQuery');
/* @var $http_query kHTTPQuery */
$get_sid = getArrayValue($http_query->Get, $this->GETName);
@@ -853,7 +853,7 @@
$admin_saved = true;
- $admin_session =& $this->Application->recallObject('Session.admin');
+ $admin_session = $this->Application->recallObject('Session.admin');
/* @var $admin_session Session */
// save to admin last_template too, because when F5 is pressed in frameset Front-End frame should reload as well
Index: kernel/utility/email_send.php
===================================================================
--- kernel/utility/email_send.php (revision 15111)
+++ kernel/utility/email_send.php (working copy)
@@ -155,7 +155,7 @@
if ($this->sendMethod == 'SMTP') {
// create connection object if we will use SMTP
- $this->smtpSocket =& $this->Application->makeClass('Socket');
+ $this->smtpSocket = $this->Application->makeClass('Socket');
}
$this->SetCharset(null, true);
@@ -1697,7 +1697,7 @@
function SetCharset($charset, $is_system = false)
{
if ( $is_system ) {
- $language =& $this->Application->recallObject('lang.current');
+ $language = $this->Application->recallObject('lang.current');
/* @var $language LanguagesItem */
$charset = $language->GetDBField('Charset') ? $language->GetDBField('Charset') : 'ISO-8859-1';
Index: kernel/utility/event.php
===================================================================
--- kernel/utility/event.php (revision 15111)
+++ kernel/utility/event.php (working copy)
@@ -282,7 +282,7 @@
$params['parent_event'] =& $top_event;
}
- $object =& $this->Application->recallObject($this->prefixSpecial, $this->pseudoClass, $params);
+ $object = $this->Application->recallObject($this->prefixSpecial, $this->pseudoClass, $params);
return $object;
}
@@ -417,7 +417,7 @@
$section = $this->Application->getUnitOption($top_prefix.'.main', 'PermSection');
// 2. check if this section has perm_prefix mapping to other prefix
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($section);
Index: kernel/utility/factory.php
===================================================================
--- kernel/utility/factory.php (revision 15130)
+++ kernel/utility/factory.php (working copy)
@@ -142,7 +142,7 @@
* @return kBase
* @access public
*/
- public function &getObject($name, $pseudo_class = '', $event_params = Array (), $arguments = Array ())
+ public function getObject($name, $pseudo_class = '', $event_params = Array (), $arguments = Array ())
{
$name = rtrim($name, '.');
@@ -170,8 +170,7 @@
trigger_error($error_msg, E_USER_WARNING);
}
- $false = false;
- return $false;
+ return false;
}
if ( defined('DEBUG_MODE') && defined('DBG_FACTORY') && DBG_FACTORY && $this->Application->isDebugMode() ) {
@@ -179,7 +178,7 @@
$this->Application->Debugger->appendTrace();
}
- $this->Storage[$name] =& $this->makeClass($pseudo_class, $arguments);
+ $this->Storage[$name] = $this->makeClass($pseudo_class, $arguments);
$this->Storage[$name]->Init($ret['prefix'], $ret['special']);
$this->Application->EventManager->runBuildEvent($ret['prefix_special'], $pseudo_class, $event_params);
@@ -224,7 +223,7 @@
* @return kBase
* @access public
*/
- public function &makeClass($pseudo_class, $arguments = Array ())
+ public function makeClass($pseudo_class, $arguments = Array ())
{
$real_class = $this->realClasses[$pseudo_class];
Index: kernel/utility/formatters/date_formatter.php
===================================================================
--- kernel/utility/formatters/date_formatter.php (revision 15111)
+++ kernel/utility/formatters/date_formatter.php (working copy)
@@ -32,7 +32,7 @@
{
parent::__construct();
- $this->language =& $this->Application->recallObject('lang.current');
+ $this->language = $this->Application->recallObject('lang.current');
}
/**
Index: kernel/utility/formatters/formatter.php
===================================================================
--- kernel/utility/formatters/formatter.php (revision 15111)
+++ kernel/utility/formatters/formatter.php (working copy)
@@ -32,7 +32,7 @@
{
parent::__construct();
- $this->_categoryHelper =& $this->Application->recallObject('CategoryHelper');
+ $this->_categoryHelper = $this->Application->recallObject('CategoryHelper');
}
/**
@@ -109,7 +109,7 @@
static $comma = null, $thousands = null;
if ( !isset($comma) || !isset($thousands) ) {
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
$comma = $lang->GetDBField('DecimalPoint');
@@ -187,7 +187,7 @@
}
if (preg_match('#int|integer|double|float|real|numeric#', $options['type'])) {
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
return $lang->formatNumber($value);
Index: kernel/utility/formatters/multilang_formatter.php
===================================================================
--- kernel/utility/formatters/multilang_formatter.php (revision 15111)
+++ kernel/utility/formatters/multilang_formatter.php (working copy)
@@ -28,7 +28,7 @@
{
parent::__construct();
- $this->helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $this->helper = $this->Application->recallObject('kMultiLanguageHelper');
}
/**
@@ -266,7 +266,7 @@
if ( !$this->Application->GetVar('allow_translation') && ($lang != $def_lang) && $object->isRequired($field) ) {
$def_lang_field = 'l' . $def_lang . '_' . $master_field;
-
+
if ( !$object->ValidateRequired($def_lang_field, $options) ) {
$object->SetError($master_field, 'primary_lang_required');
Index: kernel/utility/formatters/unit_formatter.php
===================================================================
--- kernel/utility/formatters/unit_formatter.php (revision 15111)
+++ kernel/utility/formatters/unit_formatter.php (working copy)
@@ -29,9 +29,9 @@
{
if( !isset($field_options['master_field']) )
{
- $regional =& $this->Application->recallObject('lang.current');
+ $regional = $this->Application->recallObject('lang.current');
/* @var $regional LanguagesItem */
-
+
$add_fields = Array();
$options_a = Array('type' => 'int','error_field' => $field_name,'master_field' => $field_name,'format' => '%d' );
$options_b = Array('type' => 'double','error_field' => $field_name,'master_field' => $field_name,'format' => '%0.2f' );
@@ -68,7 +68,7 @@
return ;
}
- $regional =& $this->Application->recallObject('lang.current');
+ $regional = $this->Application->recallObject('lang.current');
/* @var $regional LanguagesItem */
if ( $regional->GetDBField('UnitSystem') == 2 ) {
@@ -108,7 +108,7 @@
public function UpdateSubFields($field, $value, &$options, &$object)
{
if ( !isset($options['master_field']) ) {
- $regional =& $this->Application->recallObject('lang.current');
+ $regional = $this->Application->recallObject('lang.current');
/* @var $regional LanguagesItem */
if ( $regional->GetDBField('UnitSystem') == 2 ) {
Index: kernel/utility/formatters/upload_formatter.php
===================================================================
--- kernel/utility/formatters/upload_formatter.php (revision 15118)
+++ kernel/utility/formatters/upload_formatter.php (working copy)
@@ -30,7 +30,7 @@
{
parent::__construct();
- $this->fileHelper =& $this->Application->recallObject('FileHelper');
+ $this->fileHelper = $this->Application->recallObject('FileHelper');
if ($this->DestinationPath) {
$this->FullPath = FULL_PATH.$this->DestinationPath;
@@ -163,7 +163,7 @@
$storage_format = isset($options['storage_format']) ? $options['storage_format'] : false;
if ( $storage_format ) {
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
move_uploaded_file($value['tmp_name'], $value['tmp_name'] . '.jpg'); // add extension, so ResizeImage can work
@@ -313,7 +313,7 @@
$upload_dir = isset($options['upload_dir']) ? $options['upload_dir'] : $this->DestinationPath;
if (preg_match('/resize:([\d]*)x([\d]*)/', $format, $regs)) {
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
if (array_key_exists('include_path', $options) && $options['include_path']) {
@@ -356,7 +356,7 @@
break;
case 'img_size':
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
$image_info = $image_helper->getImageInfo(FULL_PATH . str_replace('/', DIRECTORY_SEPARATOR, $upload_dir) . $value);
Index: kernel/utility/http_query.php
===================================================================
--- kernel/utility/http_query.php (revision 15111)
+++ kernel/utility/http_query.php (working copy)
@@ -424,7 +424,7 @@
return false;
}
- $site_helper =& $this->Application->recallObject('SiteHelper');
+ $site_helper = $this->Application->recallObject('SiteHelper');
/* @var $site_helper SiteHelper */
$found = false;
@@ -708,7 +708,7 @@
$fp = fopen($log_file, 'a');
if ( $fp ) {
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
/* @var $session Session */
$user_id = $session->GetField('PortalUserId');
Index: kernel/utility/temp_handler.php
===================================================================
--- kernel/utility/temp_handler.php (revision 15130)
+++ kernel/utility/temp_handler.php (working copy)
@@ -275,7 +275,7 @@
$special .= '-item';
}
- $object =& $this->Application->recallObject($prefix.'.'.$special, $prefix, Array('skip_autoload' => true, 'parent_event' => &$this->parentEvent));
+ $object = $this->Application->recallObject($prefix.'.'.$special, $prefix, Array('skip_autoload' => true, 'parent_event' => &$this->parentEvent));
/* @var $object kCatDBItem */
$object->PopulateMultiLangFields();
@@ -388,7 +388,7 @@
//recalling by different name, because we may get kDBList, if we recall just by prefix
$recall_prefix = $prefix_special . ($special ? '' : '.') . '-item';
- $object =& $this->Application->recallObject($recall_prefix, $prefix, Array ('skip_autoload' => true, 'parent_event' => &$this->parentEvent));
+ $object = $this->Application->recallObject($recall_prefix, $prefix, Array ('skip_autoload' => true, 'parent_event' => &$this->parentEvent));
/* @var $object kDBItem */
foreach ($ids as $id) {
@@ -731,7 +731,7 @@
static $connection = null;
if (!isset($connection)) {
- $connection =& $this->Application->makeClass( 'kDBConnection', Array (SQL_TYPE, Array (&$this->Application, 'handleSQLError')) );
+ $connection = $this->Application->makeClass( 'kDBConnection', Array (SQL_TYPE, Array (&$this->Application, 'handleSQLError')) );
/* @var $connection kDBConnection */
$connection->debugMode = $this->Application->isDebugMode();
Index: units/admin/admin_events_handler.php
===================================================================
--- units/admin/admin_events_handler.php (revision 15130)
+++ units/admin/admin_events_handler.php (working copy)
@@ -80,13 +80,13 @@
$perm_value = $this->Application->isAdminUser;
}
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$csv_events = Array ('OnCSVImportBegin', 'OnCSVImportStep', 'OnExportCSV', 'OnGetCSV');
if ( in_array($event->Name, $csv_events) ) {
- $csv_helper =& $this->Application->recallObject('CSVHelper');
+ $csv_helper = $this->Application->recallObject('CSVHelper');
/* @var $csv_helper kCSVHelper */
$prefix = $csv_helper->getPrefix(stripos($event->Name, 'import') !== false);
@@ -173,7 +173,7 @@
$this->OnResetParsedData($event);
- $skin_helper =& $this->Application->recallObject('SkinHelper');
+ $skin_helper = $this->Application->recallObject('SkinHelper');
/* @var $skin_helper SkinHelper */
$skin_helper->deleteCompiled();
@@ -227,7 +227,7 @@
*/
protected function OnCompileTemplates(kEvent $event)
{
- $compiler =& $this->Application->recallObject('NParserCompiler');
+ $compiler = $this->Application->recallObject('NParserCompiler');
/* @var $compiler NParserCompiler */
$compiler->CompileTemplatesStep();
@@ -475,7 +475,7 @@
$event->status = kEvent::erSTOP;
}
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$themes_helper->refreshThemes();
@@ -492,7 +492,7 @@
*/
protected function OnSaveColumns(kEvent $event)
{
- $picker_helper =& $this->Application->recallObject('ColumnPickerHelper');
+ $picker_helper = $this->Application->recallObject('ColumnPickerHelper');
/* @var $picker_helper kColumnPickerHelper */
$picker_helper->SetGridName($this->Application->GetLinkedVar('grid_name'));
@@ -594,7 +594,7 @@
*/
protected function OnExportCSV(kEvent $event)
{
- $csv_helper =& $this->Application->recallObject('CSVHelper');
+ $csv_helper = $this->Application->recallObject('CSVHelper');
/* @var $csv_helper kCSVHelper */
$csv_helper->PrefixSpecial = $csv_helper->getPrefix(false);
@@ -612,7 +612,7 @@
*/
protected function OnGetCSV(kEvent $event)
{
- $csv_helper =& $this->Application->recallObject('CSVHelper');
+ $csv_helper = $this->Application->recallObject('CSVHelper');
/* @var $csv_helper kCSVHelper */
$csv_helper->GetCSV();
@@ -637,7 +637,7 @@
$result = 'required';
if ( $object->GetDBField('ImportFile') ) {
- $csv_helper =& $this->Application->recallObject('CSVHelper');
+ $csv_helper = $this->Application->recallObject('CSVHelper');
/* @var $csv_helper kCSVHelper */
$csv_helper->PrefixSpecial = $csv_helper->getPrefix(true);
@@ -666,7 +666,7 @@
*/
protected function OnCSVImportStep(kEvent $event)
{
- $import_helper =& $this->Application->recallObject('CSVHelper');
+ $import_helper = $this->Application->recallObject('CSVHelper');
/* @var $import_helper kCSVHelper */
$import_helper->ImportStep();
@@ -740,7 +740,7 @@
*/
protected function OnBackup(kEvent $event)
{
- $backup_helper =& $this->Application->recallObject('BackupHelper');
+ $backup_helper = $this->Application->recallObject('BackupHelper');
/* @var $backup_helper BackupHelper */
if ( !$backup_helper->initBackup() ) {
@@ -759,7 +759,7 @@
*/
protected function OnBackupProgress(kEvent $event)
{
- $backup_helper =& $this->Application->recallObject('BackupHelper');
+ $backup_helper = $this->Application->recallObject('BackupHelper');
/* @var $backup_helper BackupHelper */
$done_percent = $backup_helper->performBackup();
@@ -794,7 +794,7 @@
*/
protected function OnRestore(kEvent $event)
{
- $backup_helper =& $this->Application->recallObject('BackupHelper');
+ $backup_helper = $this->Application->recallObject('BackupHelper');
/* @var $backup_helper BackupHelper */
$backup_helper->initRestore();
@@ -810,7 +810,7 @@
*/
protected function OnRestoreProgress(kEvent $event)
{
- $backup_helper =& $this->Application->recallObject('BackupHelper');
+ $backup_helper = $this->Application->recallObject('BackupHelper');
/* @var $backup_helper BackupHelper */
$done_percent = $backup_helper->performRestore();
@@ -854,7 +854,7 @@
*/
protected function OnDeleteBackup(kEvent $event)
{
- $backup_helper =& $this->Application->recallObject('BackupHelper');
+ $backup_helper = $this->Application->recallObject('BackupHelper');
/* @var $backup_helper BackupHelper */
$backup_helper->delete();
@@ -988,7 +988,7 @@
}
}
- $json_helper =& $this->Application->recallObject('JSONHelper');
+ $json_helper = $this->Application->recallObject('JSONHelper');
/* @var $json_helper JSONHelper */
echo $json_helper->encode($ret);
@@ -1019,7 +1019,7 @@
$ret['result'] = $res ? 'OK' : 'FAILED';
}
- $json_helper =& $this->Application->recallObject('JSONHelper');
+ $json_helper = $this->Application->recallObject('JSONHelper');
/* @var $json_helper JSONHelper */
echo $json_helper->encode($ret);
@@ -1036,7 +1036,7 @@
*/
protected function OnDeploy(kEvent $event)
{
- $deployment_helper =& $this->Application->recallObject('DeploymentHelper');
+ $deployment_helper = $this->Application->recallObject('DeploymentHelper');
/* @var $deployment_helper DeploymentHelper */
$deployment_helper->deployAll();
@@ -1062,7 +1062,7 @@
*/
protected function OnSynchronizeDBRevisions(kEvent $event)
{
- $deployment_helper =& $this->Application->recallObject('DeploymentHelper');
+ $deployment_helper = $this->Application->recallObject('DeploymentHelper');
/* @var $deployment_helper DeploymentHelper */
if ( $deployment_helper->deployAll(true) ) {
Index: units/admin/admin_tag_processor.php
===================================================================
--- units/admin/admin_tag_processor.php (revision 15130)
+++ units/admin/admin_tag_processor.php (working copy)
@@ -82,7 +82,7 @@
$ret = '';
$section_name = $params['section_name'];
$params['name'] = $this->SelectParam($params, 'name,render_as,block');
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($section_name);
@@ -120,7 +120,7 @@
$section = $this->Application->RecallVar('section');
}
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($section);
@@ -187,7 +187,7 @@
$section_name = $this->Application->RecallVar('section');
}
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
if (isset($params['use_first_child']) && $params['use_first_child']) {
@@ -223,7 +223,7 @@
$section_name = $this->Application->RecallVar('section');
}
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($section_name);
@@ -307,7 +307,7 @@
{
$section_name = isset($params['section_name']) ? $params['section_name'] : $this->Application->GetVar('section_name');
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($section_name);
@@ -355,7 +355,7 @@
*/
function ListTabs($params)
{
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($params['section_name']);
@@ -562,7 +562,7 @@
$format = $params['format'];
if ( preg_match("/_regional_(.*)/", $format, $regs) ) {
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
$format = $lang->GetDBField($regs[1]);
@@ -589,7 +589,7 @@
$this->Application->RemoveVar('PermCache_UpdateRequired');
if ($this->Application->ConfigValue('QuickCategoryPermissionRebuild')) {
- $updater =& $this->Application->makeClass('kPermCacheUpdater');
+ $updater = $this->Application->makeClass('kPermCacheUpdater');
/* @var $updater kPermCacheUpdater */
$updater->OneStepRun();
@@ -618,7 +618,7 @@
function PrintColumns($params)
{
- $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
+ $picker_helper = $this->Application->recallObject('ColumnPickerHelper');
$picker_helper->SetGridName($this->Application->GetLinkedVar('grid_name'));
/* @var $picker_helper kColumnPickerHelper */
@@ -821,7 +821,7 @@
function AdminSkin($params)
{
- $skin_helper =& $this->Application->recallObject('SkinHelper');
+ $skin_helper = $this->Application->recallObject('SkinHelper');
/* @var $skin_helper SkinHelper */
return $skin_helper->AdminSkinTag($params);
@@ -872,7 +872,7 @@
function ExportData($params)
{
- $export_helper =& $this->Application->recallObject('CSVHelper');
+ $export_helper = $this->Application->recallObject('CSVHelper');
/* @var $export_helper kCSVHelper */
$result = $export_helper->ExportData( $this->SelectParam($params, 'var,name,field') );
return ($result === false) ? '' : $result;
@@ -880,7 +880,7 @@
function ImportData($params)
{
- $import_helper =& $this->Application->recallObject('CSVHelper');
+ $import_helper = $this->Application->recallObject('CSVHelper');
/* @var $import_helper kCSVHelper */
$result = $import_helper->ImportData( $this->SelectParam($params, 'var,name,field') );
return ($result === false) ? '' : $result;
@@ -888,7 +888,7 @@
function PrintCSVNotImportedLines($params)
{
- $import_helper =& $this->Application->recallObject('CSVHelper');
+ $import_helper = $this->Application->recallObject('CSVHelper');
/* @var $import_helper kCSVHelper */
return $import_helper->GetNotImportedLines();
}
@@ -921,7 +921,7 @@
*/
function PrintBackupDates($params)
{
- $backup_helper =& $this->Application->recallObject('BackupHelper');
+ $backup_helper = $this->Application->recallObject('BackupHelper');
/* @var $backup_helper BackupHelper */
$ret = '';
@@ -1081,7 +1081,7 @@
return $this->_httpAuthentificate();
}
- $password_formatter =& $this->Application->recallObject('kPasswordFormatter');
+ $password_formatter = $this->Application->recallObject('kPasswordFormatter');
/* @var $password_formatter kPasswordFormatter */
$password = $password_formatter->EncryptPassword($_SERVER['PHP_AUTH_PW'], 'b38');
Index: units/captcha/captcha_eh.php
===================================================================
--- units/captcha/captcha_eh.php (revision 15130)
+++ units/captcha/captcha_eh.php (working copy)
@@ -23,7 +23,7 @@
*/
function OnValidateCode($event)
{
- $captcha_helper =& $this->Application->recallObject('CaptchaHelper');
+ $captcha_helper = $this->Application->recallObject('CaptchaHelper');
/* @var $captcha_helper kCaptchaHelper */
$captcha_helper->validateCode($event->MasterEvent);
@@ -36,7 +36,7 @@
*/
function OnPrepareCaptcha($event)
{
- $captcha_helper =& $this->Application->recallObject('CaptchaHelper');
+ $captcha_helper = $this->Application->recallObject('CaptchaHelper');
/* @var $captcha_helper kCaptchaHelper */
// create field for captcha code storage
Index: units/categories/cache_updater.php
===================================================================
--- units/categories/cache_updater.php (revision 15111)
+++ units/categories/cache_updater.php (working copy)
@@ -215,7 +215,7 @@
}
// cache widely used values to speed up process
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$this->languages = $ml_helper->getLanguages();
Index: units/categories/categories_event_handler.php
===================================================================
--- units/categories/categories_event_handler.php (revision 15130)
+++ units/categories/categories_event_handler.php (working copy)
@@ -70,7 +70,7 @@
if ( $event->Name == 'OnResetCMSMenuCache' ) {
// events from "Tools -> System Tools" section are controlled via that section "edit" permission
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$perm_value = $this->Application->CheckPermission('in-portal:service.edit');
@@ -95,7 +95,7 @@
if ( in_array($event->Name, $this->_getMassPermissionEvents()) ) {
$items = $this->_getPermissionCheckInfo($event);
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
if ( ($event->Name == 'OnSave') && array_key_exists(0, $items) ) {
@@ -125,7 +125,7 @@
}
if ( $event->Name == 'OnRecalculatePriorities' ) {
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$category_id = $this->Application->GetVar('m_cat_id');
@@ -390,7 +390,7 @@
$processed_prefix = $this->Application->processPrefix($prefix_special);
if ($processed_prefix['prefix'] == $related_prefix) {
// printing related categories within list of items (not on details page)
- $list =& $this->Application->recallObject($prefix_special);
+ $list = $this->Application->recallObject($prefix_special);
/* @var $list kDBList */
$id = $list->GetID();
@@ -407,7 +407,7 @@
}
}
- $p_item =& $this->Application->recallObject($related_prefix . '.current', null, Array('skip_autoload' => true));
+ $p_item = $this->Application->recallObject($related_prefix . '.current', null, Array('skip_autoload' => true));
/* @var $p_item kCatDBItem */
$p_item->Load( (int)$id );
@@ -549,7 +549,7 @@
$type_clauses['search']['having_filter'] = false;
}
- $search_helper =& $this->Application->recallObject('SearchHelper');
+ $search_helper = $this->Application->recallObject('SearchHelper');
/* @var $search_helper kSearchHelper */
$search_helper->SetComplexFilter($event, $type_clauses, implode(',', $types), implode(',', $except_types));
@@ -562,7 +562,7 @@
*/
function _getCurrentThemeId()
{
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
return (int)$themes_helper->getCurrentThemeId();
@@ -635,13 +635,13 @@
if ($page_id === false && EDITING_MODE) {
// create missing pages, when in editing mode
- $object =& $this->Application->recallObject($this->Prefix . '.rebuild', null, Array('skip_autoload' => true));
+ $object = $this->Application->recallObject($this->Prefix . '.rebuild', null, Array('skip_autoload' => true));
/* @var $object CategoriesItem */
$created = $this->_prepareAutoPage($object, $template, null, SMS_MODE_AUTO); // create virtual (not system!) page
if ($created) {
if ($this->Application->ConfigValue('QuickCategoryPermissionRebuild') || !$this->Application->isAdmin) {
- $updater =& $this->Application->makeClass('kPermCacheUpdater');
+ $updater = $this->Application->makeClass('kPermCacheUpdater');
/* @var $updater kPermCacheUpdater */
$updater->OneStepRun();
@@ -711,7 +711,7 @@
{
parent::OnAfterCopyToLive($event);
- $object =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true, 'live_table' => true));
+ $object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true, 'live_table' => true));
/* @var $object CategoriesItem */
$parent_path = false;
@@ -730,7 +730,7 @@
}
if ( $parent_path ) {
- $cache_updater =& $this->Application->makeClass('kPermCacheUpdater', Array (null, $parent_path));
+ $cache_updater = $this->Application->makeClass('kPermCacheUpdater', Array (null, $parent_path));
/* @var $cache_updater kPermCacheUpdater */
$cache_updater->OneStepRun();
@@ -766,7 +766,7 @@
}
// existing category was edited, check if in-cache fields are modified
- $live_object =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('live_table' => true, 'skip_autoload' => true));
+ $live_object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('live_table' => true, 'skip_autoload' => true));
/* @var $live_object CategoriesItem */
$live_object->Load($id);
@@ -883,7 +883,7 @@
$filename_changes = $this->Application->GetVar($event->Prefix . '_filename_changes', Array ());
if ( $filename_changes ) {
- $opener_stack =& $this->Application->makeClass('kOpenerStack');
+ $opener_stack = $this->Application->makeClass('kOpenerStack');
/* @var $opener_stack kOpenerStack */
list ($template, $params, $index_file) = $opener_stack->pop();
@@ -1046,7 +1046,7 @@
$recycle_bin = $this->Application->ConfigValue('RecycleBinFolder');
if ( $recycle_bin ) {
- $rb =& $this->Application->recallObject('c.recycle', null, Array ('skip_autoload' => true));
+ $rb = $this->Application->recallObject('c.recycle', null, Array ('skip_autoload' => true));
/* @var $rb CategoriesItem */
$rb->Load($recycle_bin);
@@ -1076,7 +1076,7 @@
$ids = $event->getEventParam('ids');
if ( $ids ) {
- $recursive_helper =& $this->Application->recallObject('RecursiveHelper');
+ $recursive_helper = $this->Application->recallObject('RecursiveHelper');
/* @var $recursive_helper kRecursiveHelper */
foreach ($ids as $id) {
@@ -1098,7 +1098,7 @@
{
$this->Application->RemoveVar('clipboard');
- $clipboard_helper =& $this->Application->recallObject('ClipboardHelper');
+ $clipboard_helper = $this->Application->recallObject('ClipboardHelper');
/* @var $clipboard_helper kClipboardHelper */
$clipboard_helper->setClipboard($event, 'copy', $this->StoreSelectedIDs($event));
@@ -1114,7 +1114,7 @@
{
$this->Application->RemoveVar('clipboard');
- $clipboard_helper =& $this->Application->recallObject('ClipboardHelper');
+ $clipboard_helper = $this->Application->recallObject('ClipboardHelper');
/* @var $clipboard_helper kClipboardHelper */
$clipboard_helper->setClipboard($event, 'cut', $this->StoreSelectedIDs($event));
@@ -1145,7 +1145,7 @@
*/
function _checkPastePermission($event)
{
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$category_id = $this->Application->GetVar('m_cat_id');
@@ -1189,7 +1189,7 @@
$source_category_id = $this->Conn->GetOne($sql);
}
- $recursive_helper =& $this->Application->recallObject('RecursiveHelper');
+ $recursive_helper = $this->Application->recallObject('RecursiveHelper');
/* @var $recursive_helper kRecursiveHelper */
if ( $clipboard_data['cut'] ) {
@@ -1213,7 +1213,7 @@
}
}
- $priority_helper =& $this->Application->recallObject('PriorityHelper');
+ $priority_helper = $this->Application->recallObject('PriorityHelper');
/* @var $priority_helper kPriorityHelper */
if ( $clipboard_data['cut'] ) {
@@ -1247,7 +1247,7 @@
protected function _ensurePermCacheRebuild($event)
{
if ( $this->Application->ConfigValue('QuickCategoryPermissionRebuild') ) {
- $updater =& $this->Application->makeClass('kPermCacheUpdater');
+ $updater = $this->Application->makeClass('kPermCacheUpdater');
/* @var $updater kPermCacheUpdater */
$updater->OneStepRun();
@@ -1281,7 +1281,7 @@
$ids_sql = 'SELECT '.$id_field.' FROM '.$table.' WHERE ResourceId IN (%s)';
$resource_ids_sql = 'SELECT ItemResourceId FROM '.TABLE_PREFIX.'CategoryItems WHERE CategoryId = %s AND PrimaryCat = 1';
- $object =& $this->Application->recallObject($event->Prefix.'.item', $event->Prefix, Array('skip_autoload' => true));
+ $object = $this->Application->recallObject($event->Prefix.'.item', $event->Prefix, Array('skip_autoload' => true));
foreach($cat_ids as $source_cat => $dest_cat)
{
@@ -1291,7 +1291,7 @@
$this->Application->SetVar('m_cat_id', $dest_cat);
$item_ids = $this->Conn->GetCol( sprintf($ids_sql, implode(',', $item_resource_ids) ) );
- $temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+ $temp = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
if($item_ids) $temp->CloneItems($event->Prefix, $event->Special, $item_ids);
}
@@ -1335,7 +1335,7 @@
return ;
}
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$new_status = false;
@@ -1418,7 +1418,7 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $cache_updater =& $this->Application->makeClass('kPermCacheUpdater', Array (null, $object->GetDBField('ParentPath')));
+ $cache_updater = $this->Application->makeClass('kPermCacheUpdater', Array (null, $object->GetDBField('ParentPath')));
/* @var $cache_updater kPermCacheUpdater */
$cache_updater->OneStepRun();
@@ -1602,7 +1602,7 @@
$t = $this->Application->GetVar('t');
}
- $page =& $this->Application->recallObject($this->Prefix . '.-virtual', null, Array ('page' => $t));
+ $page = $this->Application->recallObject($this->Prefix . '.-virtual', null, Array ('page' => $t));
/* @var $page CategoriesItem */
if ( $page->isLoaded() ) {
@@ -1617,7 +1617,7 @@
$not_found = $this->Application->ConfigValue('ErrorTemplate');
$real_t = $not_found ? $not_found : 'error_notfound';
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$theme_id = $this->Application->GetVar('m_theme');
@@ -1628,7 +1628,7 @@
}
// replace alias in form #alias_name# to actual template used in this theme
- $theme =& $this->Application->recallObject('theme.current');
+ $theme = $this->Application->recallObject('theme.current');
/* @var $theme kDBItem */
$template = $theme->GetField('TemplateAliases', $real_t);
@@ -1648,7 +1648,7 @@
/*function SetCatByTemplate()
{
$t = $this->Application->GetVar('t');
- $page =& $this->Application->recallObject($this->Prefix . '.-virtual');
+ $page = $this->Application->recallObject($this->Prefix . '.-virtual');
if ($page->isLoaded()) {
$this->Application->SetVar('m_cat_id', $page->GetDBField('CategoryId') );
@@ -1745,7 +1745,7 @@
{
$value = $object->GetField($field, 'no_default'); // current value of target field
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
$src_field = $ml_formatter->LangFieldName('Name');
@@ -1887,12 +1887,12 @@
$backup_category_id = $this->Application->GetVar('m_cat_id');
- $object =& $this->Application->recallObject($this->Prefix . '.rebuild-path', null, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject($this->Prefix . '.rebuild-path', null, Array ('skip_autoload' => true));
/* @var $object CategoriesItem */
$parent_id = $base_category;
- $filenames_helper =& $this->Application->recallObject('FilenamesHelper');
+ $filenames_helper = $this->Application->recallObject('FilenamesHelper');
/* @var $filenames_helper kFilenamesHelper */
$safe_category_path = array_map(Array (&$filenames_helper, 'replaceSequences'), $category_path);
@@ -2010,7 +2010,7 @@
return ;
}
- $site_config_helper =& $this->Application->recallObject('SiteConfigHelper');
+ $site_config_helper = $this->Application->recallObject('SiteConfigHelper');
/* @var $site_config_helper SiteConfigHelper */
$settings = $site_config_helper->getSettings();
@@ -2033,7 +2033,7 @@
$this->Application->setUnitOption($event->Prefix, 'SectionAdjustments', $section_adjustments);
// prepare structure dropdown
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
@@ -2178,7 +2178,7 @@
set_time_limit(0);
ini_set('memory_limit', -1);
- $dummy =& $this->Application->recallObject($event->Prefix . '.rebuild', null, Array ('skip_autoload' => true));
+ $dummy = $this->Application->recallObject($event->Prefix . '.rebuild', null, Array ('skip_autoload' => true));
/* @var $dummy CategoriesItem */
$error_count = 0;
@@ -2190,7 +2190,7 @@
}
if ($this->Application->ConfigValue('QuickCategoryPermissionRebuild')) {
- $updater =& $this->Application->makeClass('kPermCacheUpdater');
+ $updater = $this->Application->makeClass('kPermCacheUpdater');
/* @var $updater kPermCacheUpdater */
$updater->OneStepRun();
@@ -2246,7 +2246,7 @@
$event->status = kEvent::erSTOP;
$string = kUtil::unhtmlentities($this->Application->GetVar('preview_content'));
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
$string = $category_helper->replacePageIds($string);
@@ -2267,7 +2267,7 @@
$keywords = kUtil::unhtmlentities( trim($this->Application->GetVar('keywords')) );
- $query_object =& $this->Application->recallObject('HTTPQuery');
+ $query_object = $this->Application->recallObject('HTTPQuery');
/* @var $query_object kHTTPQuery */
$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
@@ -2399,7 +2399,7 @@
}
// keyword string processing
- $search_helper =& $this->Application->recallObject('SearchHelper');
+ $search_helper = $this->Application->recallObject('SearchHelper');
/* @var $search_helper kSearchHelper */
$where_clause = Array ();
@@ -2575,7 +2575,7 @@
}
if ( $object->Load($id, null, true) ) {
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
@@ -2658,7 +2658,7 @@
$ret = '';
list ($prefix) = explode('.', $prefix_special);
- $rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+ $rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
/* @var $rewrite_processor kRewriteUrlProcessor */
$processed_params = $rewrite_processor->getProcessedParams($prefix_special, $params, $keep_events);
@@ -2777,7 +2777,7 @@
WHERE FriendlyURL = ' . $this->Conn->qstr(implode('/', $url_parts));
$friendly = $this->Conn->GetRow($sql);
- $rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+ $rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
/* @var $rewrite_processor kRewriteUrlProcessor */
if ($friendly) {
@@ -2814,7 +2814,7 @@
$last_category_info = false;
$category_path = $url_part == 'content' ? '' : 'content';
- $rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+ $rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
/* @var $rewrite_processor kRewriteUrlProcessor */
do {
Index: units/categories/categories_item.php
===================================================================
--- units/categories/categories_item.php (revision 15111)
+++ units/categories/categories_item.php (working copy)
@@ -48,7 +48,7 @@
*/
protected function stripDisallowed($string)
{
- $filenames_helper =& $this->Application->recallObject('FilenamesHelper');
+ $filenames_helper = $this->Application->recallObject('FilenamesHelper');
/* @var $filenames_helper kFilenamesHelper */
$string = $filenames_helper->replaceSequences($string);
@@ -80,7 +80,7 @@
}
if (!isset($current_theme)) {
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$current_theme = (int)$themes_helper->getCurrentThemeId();
@@ -156,7 +156,7 @@
return ;
}
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
$name = $this->stripDisallowed( $this->GetDBField($ml_formatter->LangFieldName('Name', true)) );
Index: units/categories/categories_tag_processor.php
===================================================================
--- units/categories/categories_tag_processor.php (revision 15130)
+++ units/categories/categories_tag_processor.php (working copy)
@@ -39,7 +39,7 @@
*/
function CategoryCount($params)
{
- $count_helper =& $this->Application->recallObject('CountHelper');
+ $count_helper = $this->Application->recallObject('CountHelper');
/* @var $count_helper kCountHelper */
$today_only = isset($params['today']) && $params['today'];
@@ -181,7 +181,7 @@
function CategoryPath($params)
{
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
return $category_helper->NavigationBar($params);
@@ -211,7 +211,7 @@
function CurrentCategoryName($params)
{
- $cat_object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List');
+ $cat_object = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List');
/* @var $cat_object kDBList */
$sql = 'SELECT '.$this->getTitleField().'
@@ -234,7 +234,7 @@
function getTitleField()
{
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
return $ml_formatter->LangFieldName('Name');
@@ -311,7 +311,7 @@
function CategoryList($params)
{
- //$object =& $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params );
+ //$object = $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params );
$object =& $this->GetList($params);
@@ -344,13 +344,13 @@
function Meta($params)
{
- $object =& $this->Application->recallObject($this->Prefix); // .'.-item'
+ $object = $this->Application->recallObject($this->Prefix); // .'.-item'
/* @var $object CategoriesItem */
$meta_type = $params['name'];
if ($object->isLoaded()) {
// 1. get module prefix by current category
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
$category_path = explode('|', substr($object->GetDBField('ParentPath'), 1, -1));
@@ -372,7 +372,7 @@
if ($this->Application->GetVar('t') == $item_template) {
// we are located on item's details page
- $item =& $this->Application->recallObject($module_info['Var']);
+ $item = $this->Application->recallObject($module_info['Var']);
/* @var $item kCatDBItem */
// 3. get item's meta data
@@ -516,7 +516,7 @@
$continue = 1;
}
- $updater =& $this->Application->makeClass('kPermCacheUpdater', Array($continue));
+ $updater = $this->Application->makeClass('kPermCacheUpdater', Array($continue));
/* @var $updater kPermCacheUpdater */
if ($continue === '0') { // No in dialog
@@ -739,7 +739,7 @@
$cat_id = $this->Application->findModule('Name', $params['module'], 'RootCat');
}
- $category =& $this->Application->recallObject($this->Prefix . '.-c' . $cat_id, $this->Prefix, Array ('skip_autoload' => true));
+ $category = $this->Application->recallObject($this->Prefix . '.-c' . $cat_id, $this->Prefix, Array ('skip_autoload' => true));
/* @var $category CategoriesItem */
$category->Load($cat_id);
@@ -760,7 +760,7 @@
*/
function HasPermission($params)
{
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$params['raise_warnings'] = 0;
@@ -828,7 +828,7 @@
$format = isset($params['format']) ? $params['format'] : '_regional_DateTimeFormat';
if ( preg_match("/_regional_(.*)/", $format, $regs) ) {
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
if ( $regs[1] == 'DateTimeFormat' ) {
@@ -851,7 +851,7 @@
$params['cat_id'] = $object->GetID();
- $count_helper =& $this->Application->recallObject('CountHelper');
+ $count_helper = $this->Application->recallObject('CountHelper');
/* @var $count_helper kCountHelper */
return $count_helper->CategoryItemCount($params['prefix'], $params);
@@ -909,7 +909,7 @@
$parent_path = explode('|', substr($object->GetDBField('ParentPath'), 1, -1));
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
$module_info = $category_helper->getCategoryModule($params, $parent_path);
@@ -970,12 +970,12 @@
$app_id = $this->Application->ConfigValue('YahooApplicationId');
$url = 'http://search.yahooapis.com/WebSearchService/V1/spellingSuggestion?appid=' . $app_id . '&query=';
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$xml_data = $curl_helper->Send( $url . urlencode($keywords) );
- $xml_helper =& $this->Application->recallObject('kXMLHelper');
+ $xml_helper = $this->Application->recallObject('kXMLHelper');
/* @var $xml_helper kXMLHelper */
$root_node =& $xml_helper->Parse($xml_data);
@@ -1113,7 +1113,7 @@
*/
function &_getPage($params)
{
- $page =& $this->Application->recallObject($this->Prefix . '.-virtual', null, $params);
+ $page = $this->Application->recallObject($this->Prefix . '.-virtual', null, $params);
/* @var $page kDBItem */
// 1. load by given id
@@ -1139,7 +1139,7 @@
if (!$structure_path_match && !$design_match) {
// Same sql like in "c:getPassedID". Load, when current page object doesn't match requested page object
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$page_id = $themes_helper->getPageByTemplate($template);
@@ -1180,10 +1180,10 @@
return '';
}
- $page_helper =& $this->Application->recallObject('PageHelper');
+ $page_helper = $this->Application->recallObject('PageHelper');
/* @var $page_helper PageHelper */
- $content =& $this->Application->recallObject('content.-block', null, Array ('skip_autoload' => true));
+ $content = $this->Application->recallObject('content.-block', null, Array ('skip_autoload' => true));
/* @var $content kDBItem */
if ( !$page_helper->loadContentBlock($content, $page, $num) && EDITING_MODE ) {
@@ -1377,7 +1377,7 @@
$this->Application->SetVar('admin_scripts_included', 1);
$js_url = $this->Application->BaseURL() . 'core/admin_templates/js';
- $minify_helper =& $this->Application->recallObject('MinifyHelper');
+ $minify_helper = $this->Application->recallObject('MinifyHelper');
/* @var $minify_helper MinifyHelper */
$to_compress = Array (
@@ -1433,7 +1433,7 @@
'index_file' => 'index.php',
);
- $page_helper =& $this->Application->recallObject('PageHelper');
+ $page_helper = $this->Application->recallObject('PageHelper');
/* @var $page_helper PageHelper */
$class_params = Array (
@@ -1625,7 +1625,7 @@
$edit_code .= $tabs . 'a_toolbar.Render();' . "\n";
- $revision =& $this->Application->recallObject('page-revision.current');
+ $revision = $this->Application->recallObject('page-revision.current');
/* @var $revision kDBItem */
if ( !$revision->GetDBField('IsDraft') ) {
@@ -1717,7 +1717,7 @@
$template = $this->Application->GetVar('t');
if (!$this->Application->TemplatesCache->TemplateExists($template) && !$this->Application->isAdmin) {
- $cms_handler =& $this->Application->recallObject($this->Prefix . '_EventHandler');
+ $cms_handler = $this->Application->recallObject($this->Prefix . '_EventHandler');
/* @var $cms_handler CategoriesEventHandler */
$template = ltrim($cms_handler->GetDesignTemplate(), '/');
@@ -1740,7 +1740,7 @@
*/
function CachedMenu($params)
{
- $menu_helper =& $this->Application->recallObject('MenuHelper');
+ $menu_helper = $this->Application->recallObject('MenuHelper');
/* @var $menu_helper MenuHelper */
return $menu_helper->menuTag($this->getPrefixSpecial(), $params);
@@ -1781,7 +1781,7 @@
*/
function PrintSubPages($params)
{
- $list =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List', $params);
+ $list = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix.'_List', $params);
/* @var $list kDBList */
$category_id = array_key_exists('category_id', $params) ? $params['category_id'] : $this->Application->GetVar('m_cat_id');
@@ -1815,10 +1815,10 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
- $site_config_helper =& $this->Application->recallObject('SiteConfigHelper');
+ $site_config_helper = $this->Application->recallObject('SiteConfigHelper');
/* @var $site_config_helper SiteConfigHelper */
$settings = $site_config_helper->getSettings();
@@ -1844,7 +1844,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$url_params = Array (
@@ -1964,7 +1964,7 @@
$block_params = $this->prepareTagParams($params);
$block_params['name'] = $block_params['render_as'];
- $object =& $this->Application->recallObject($this->Prefix);
+ $object = $this->Application->recallObject($this->Prefix);
/* @var $object kDBItem */
$category_ids = explode('|', substr($object->GetDBField('ParentPath'), 1, -1));
@@ -2022,7 +2022,7 @@
return '';
}
- $template_helper =& $this->Application->recallObject('TemplateHelper');
+ $template_helper = $this->Application->recallObject('TemplateHelper');
/* @var $template_helper TemplateHelper */
return $template_helper->blockInfo( $params['name'] );
@@ -2067,7 +2067,7 @@
}
}
- $json_helper =& $this->Application->recallObject('JSONHelper');
+ $json_helper = $this->Application->recallObject('JSONHelper');
/* @var $json_helper JSONHelper */
return $json_helper->encode($ret);
@@ -2151,14 +2151,14 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$perm_prefix = $this->Application->getUnitOption($this->Prefix, 'PermItemPrefix');
$categories = $perm_helper->getPermissionCategories($perm_prefix . '.' . ($object->IsNewItem() ? 'ADD' : 'MODIFY'));
}
- $json_helper =& $this->Application->recallObject('JSONHelper');
+ $json_helper = $this->Application->recallObject('JSONHelper');
/* @var $json_helper JSONHelper */
return $json_helper->encode($categories);
Index: units/category_items/category_items_event_handler.php
===================================================================
--- units/category_items/category_items_event_handler.php (revision 15130)
+++ units/category_items/category_items_event_handler.php (working copy)
@@ -31,7 +31,7 @@
$object =& $event->getObject();
/* @var $object kDBList */
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
$object->addCalculatedField('CategoryName', 'c.' . $ml_formatter->LangFieldName('CachedNavbar'));
@@ -148,7 +148,7 @@
}
$item_prefix = $event->getEventParam('item_prefix');
- $item =& $this->Application->recallObject($item_prefix . '.-item', null, Array ('skip_autoload' => true));
+ $item = $this->Application->recallObject($item_prefix . '.-item', null, Array ('skip_autoload' => true));
/* @var $item kCatDBItem */
$ci_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
Index: units/configuration/configuration_event_handler.php
===================================================================
--- units/configuration/configuration_event_handler.php (revision 15130)
+++ units/configuration/configuration_event_handler.php (working copy)
@@ -117,7 +117,7 @@
$object->SetFieldOptions('VariableValue', $field_options);
}
else {
- $password_formatter =& $this->Application->recallObject('kPasswordFormatter');
+ $password_formatter = $this->Application->recallObject('kPasswordFormatter');
/* @var $password_formatter kPasswordFormatter */
$object->SetDBField('VariableValue', $password_formatter->EncryptPassword($object->GetDBField('VariableValue'), 'b38'));
@@ -142,7 +142,7 @@
return;
}
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$state_iso = $cs_helper->getStateIso($check_state, $check_country);
@@ -219,7 +219,7 @@
if ( $variable_name == 'Require_AdminSSL' || $variable_name == 'AdminSSL_URL' ) {
// when administrative console is moved to SSL mode, then delete skin
if ( in_array($variable_name, $changed) && !$skin_deleted ) {
- $skin_helper =& $this->Application->recallObject('SkinHelper');
+ $skin_helper = $this->Application->recallObject('SkinHelper');
/* @var $skin_helper SkinHelper */
$skin_file = $skin_helper->getSkinPath();
@@ -360,7 +360,7 @@
$template = $this->Application->ConfigValue('HardMaintenanceTemplate');
}
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$html = $curl_helper->Send($this->Application->BaseURL() . '?t=' . $template);
Index: units/content/content_eh.php
===================================================================
--- units/content/content_eh.php (revision 15130)
+++ units/content/content_eh.php (working copy)
@@ -25,7 +25,7 @@
*/
public function CheckPermission(kEvent $event)
{
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$user_id = $this->Application->RecallVar('user_id');
@@ -104,7 +104,7 @@
if ( $is_draft ) {
if ( $updated ) {
- $page_helper =& $this->Application->recallObject('PageHelper');
+ $page_helper = $this->Application->recallObject('PageHelper');
/* @var $page_helper PageHelper */
return $revision->GetField('AutoSavedOn') . ' (' . $page_helper->getAgoTime( $revision->GetDBField('AutoSavedOn') ) . ')';
@@ -133,7 +133,7 @@
list ($object, $revision) = $this->getContentBlockAndRevision($event);
/* @var $revision kDBItem */
- $page_helper =& $this->Application->recallObject('PageHelper');
+ $page_helper = $this->Application->recallObject('PageHelper');
/* @var $page_helper PageHelper */
$time = $revision->GetField('AutoSavedOn');
@@ -173,7 +173,7 @@
list ($id, $field_values) = each($items_info);
$object->Load($id);
- $revision =& $this->Application->recallObject('page-revision', null, Array ('skip_autoload' => true));
+ $revision = $this->Application->recallObject('page-revision', null, Array ('skip_autoload' => true));
/* @var $revision kDBItem */
$revision->Load( $object->GetDBField('RevisionId') );
Index: units/country_states/country_state_eh.php
===================================================================
--- units/country_states/country_state_eh.php (revision 15130)
+++ units/country_states/country_state_eh.php (working copy)
@@ -50,7 +50,7 @@
/* @var $object kDBList */
if ( ($event->Special == 'selected') || ($event->Special == 'available') ) {
- $edit_picker_helper =& $this->Application->recallObject('EditPickerHelper');
+ $edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
/* @var $edit_picker_helper EditPickerHelper */
$edit_picker_helper->applyFilter($event, 'Countries');
@@ -126,7 +126,7 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
if ( $cs_helper->CountryHasStates($object->GetDBField('IsoCode')) ) {
@@ -146,7 +146,7 @@
{
$event->status = kEvent::erSTOP;
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$states = $cs_helper->getStates( (string)$this->Application->GetVar('country_iso') );
Index: units/custom_data/custom_data_event_handler.php
===================================================================
--- units/custom_data/custom_data_event_handler.php (revision 15130)
+++ units/custom_data/custom_data_event_handler.php (working copy)
@@ -171,7 +171,7 @@
$calculated_fields = Array ();
$virtual_fields = $this->Application->getUnitOption($prefix, 'VirtualFields', Array ());
- $cf_helper =& $this->Application->recallObject('InpCustomFieldsHelper');
+ $cf_helper = $this->Application->recallObject('InpCustomFieldsHelper');
/* @var $cf_helper InpCustomFieldsHelper */
$is_install = defined('IS_INSTALL') && IS_INSTALL;
Index: units/custom_fields/custom_fields_event_handler.php
===================================================================
--- units/custom_fields/custom_fields_event_handler.php (revision 15130)
+++ units/custom_fields/custom_fields_event_handler.php (working copy)
@@ -165,7 +165,7 @@
$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
// call main item config to clone cdata table
@@ -207,7 +207,7 @@
$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
// call main item config to clone cdata table
@@ -269,7 +269,7 @@
return ;
}
- $custom_field_helper =& $this->Application->recallObject('InpCustomFieldsHelper');
+ $custom_field_helper = $this->Application->recallObject('InpCustomFieldsHelper');
/* @var $custom_field_helper InpCustomFieldsHelper */
$options = $custom_field_helper->GetValuesHash($object->GetDBField('ValueList'), VALUE_LIST_SEPARATOR, false);
@@ -286,7 +286,7 @@
$records[] = Array ('OptionKey' => $option_key, 'OptionTitle' => $option_title);
}
- $minput_helper =& $this->Application->recallObject('MInputHelper');
+ $minput_helper = $this->Application->recallObject('MInputHelper');
/* @var $minput_helper MInputHelper */
$xml = $minput_helper->prepareMInputXML($records, Array ('OptionKey', 'OptionTitle'));
@@ -322,7 +322,7 @@
return ;
}
- $minput_helper =& $this->Application->recallObject('MInputHelper');
+ $minput_helper = $this->Application->recallObject('MInputHelper');
/* @var $minput_helper MInputHelper */
$ret = $object->GetDBField('ElementType') == 'select' ? Array ('' => '=+') : Array ();
Index: units/custom_fields/custom_fields_tag_processor.php
===================================================================
--- units/custom_fields/custom_fields_tag_processor.php (revision 15111)
+++ units/custom_fields/custom_fields_tag_processor.php (working copy)
@@ -89,7 +89,7 @@
$source_object = $original_object = null;
if ( $source_prefix ) {
- $source_object =& $this->Application->recallObject($source_prefix, null, Array ('raise_warnings' => 0)); // it's possible, that in some cases object will not be loaded
+ $source_object = $this->Application->recallObject($source_prefix, null, Array ('raise_warnings' => 0)); // it's possible, that in some cases object will not be loaded
/* @var $source_object kCatDBItem */
$display_original = $this->Application->ProcessParsedTag($source_prefix, 'DisplayOriginal', Array ('display_original' => $this->setParamValue($params, 'display_original')));
@@ -99,7 +99,7 @@
$block_params['display_original'] = $display_original;
$block_params['original_title'] = $this->setParamValue($params, 'original_title');
- $original_object =& $this->Application->recallObject($source_prefix . '.original', null, Array ('raise_warnings' => 0)); // it's possible, that in some cases object will not be loaded
+ $original_object = $this->Application->recallObject($source_prefix . '.original', null, Array ('raise_warnings' => 0)); // it's possible, that in some cases object will not be loaded
/* @var $original_object kCatDBItem */
}
Index: units/email_events/email_events_event_handler.php
===================================================================
--- units/email_events/email_events_event_handler.php (revision 15130)
+++ units/email_events/email_events_event_handler.php (working copy)
@@ -121,7 +121,7 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $target_object =& $this->Application->recallObject($event->Special);
+ $target_object = $this->Application->recallObject($event->Special);
/* @var $target_object kDBList */
$object->SetDBField('Recipients', $target_object->GetDBField($mapping[$event->Special]));
@@ -285,7 +285,7 @@
$email = $user_info['Email'];
$name = trim($user_info['FirstName'] . ' ' . $user_info['LastName']);
- $user =& $this->Application->recallObject('u.email-from', null, Array('skip_autoload' => true));
+ $user = $this->Application->recallObject('u.email-from', null, Array('skip_autoload' => true));
/* @var $user UsersItem */
$user->Load($user_info['PortalUserId']);
@@ -316,7 +316,7 @@
$name = strip_tags( $this->Application->ConfigValue('Site_Name') );
}
- $esender =& $this->Application->recallObject('EmailSender');
+ $esender = $this->Application->recallObject('EmailSender');
/* @var $esender kEmailSendingHelper */
$esender->SetFrom($email, $name);
@@ -378,7 +378,7 @@
array_unshift($all_recipients[EmailEvent::RECIPIENT_TYPE_TO], $add_recipient);
- $user =& $this->Application->recallObject('u.email-to', null, Array('skip_autoload' => true));
+ $user = $this->Application->recallObject('u.email-to', null, Array('skip_autoload' => true));
/* @var $user UsersItem */
$user->Load($to_user_id);
@@ -411,7 +411,7 @@
$this->_addDefaultRecipient($all_recipients);
}
- $esender =& $this->Application->recallObject('EmailSender');
+ $esender = $this->Application->recallObject('EmailSender');
/* @var $esender kEmailSendingHelper */
$header_mapping = Array (
@@ -530,7 +530,7 @@
return false;
}
- $minput_helper =& $this->Application->recallObject('MInputHelper');
+ $minput_helper = $this->Application->recallObject('MInputHelper');
/* @var $minput_helper MInputHelper */
// group recipients by type
@@ -618,7 +618,7 @@
$fields_hash['Body'] = $body;
- $email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
+ $email_message_helper = $this->Application->recallObject('EmailMessageHelper');
/* @var $email_message_helper EmailMessageHelper */
$ret = $email_message_helper->buildTemplate($fields_hash);
@@ -659,7 +659,7 @@
}
if ($message_type == 'text') {
- $esender =& $this->Application->recallObject('EmailSender');
+ $esender = $this->Application->recallObject('EmailSender');
/* @var $esender kEmailSendingHelper */
$footer = $esender->ConvertToText($footer);
@@ -702,7 +702,7 @@
$message_headers = Array ();
list($headers, $message_body) = explode('&|&', $message, 2);
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
$message_body = $category_helper->replacePageIds($message_body);
@@ -760,7 +760,7 @@
}
// 3. set headers & send message
- $esender =& $this->Application->recallObject('EmailSender');
+ $esender = $this->Application->recallObject('EmailSender');
/* @var $esender kEmailSendingHelper */
$message_subject = isset($message_headers['Subject']) ? $message_headers['Subject'] : 'Mail message';
@@ -828,7 +828,7 @@
$this->Application->SetVar('m_lang', $language_id);
- $language =& $this->Application->recallObject('lang.current');
+ $language = $this->Application->recallObject('lang.current');
/* @var $language LanguagesItem */
$language->Load($language_id);
@@ -887,7 +887,7 @@
return ;
}
- $mailing_list_helper =& $this->Application->recallObject('MailingListHelper');
+ $mailing_list_helper = $this->Application->recallObject('MailingListHelper');
/* @var $mailing_list_helper MailingListHelper */
$mailing_list_helper->processQueue($messages);
@@ -983,7 +983,7 @@
$records[] = Array ('Tag' => $tag, 'Replacement' => $replacement);
}
- $minput_helper =& $this->Application->recallObject('MInputHelper');
+ $minput_helper = $this->Application->recallObject('MInputHelper');
/* @var $minput_helper MInputHelper */
$xml = $minput_helper->prepareMInputXML($records, Array ('Tag', 'Replacement'));
@@ -1033,7 +1033,7 @@
// process replacement tags
if ( $object->GetDBField('ReplacementTagsXML') ) {
- $minput_helper =& $this->Application->recallObject('MInputHelper');
+ $minput_helper = $this->Application->recallObject('MInputHelper');
/* @var $minput_helper MInputHelper */
$replacement_tags = Array ();
Index: units/favorites/favorites_eh.php
===================================================================
--- units/favorites/favorites_eh.php (revision 15130)
+++ units/favorites/favorites_eh.php (working copy)
@@ -42,7 +42,7 @@
function OnFavoriteToggle($event)
{
$parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
- $parent_object =& $this->Application->recallObject($parent_prefix);
+ $parent_object = $this->Application->recallObject($parent_prefix);
/* @var $parent_object kDBItem */
if (!$parent_object->isLoaded() || !$this->Application->CheckPermission('FAVORITES', 0, $parent_object->GetDBField('ParentPath'))) {
@@ -87,7 +87,7 @@
$object->SetDBField('PortalUserId', $user_id);
$parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
- $parent_object =& $this->Application->recallObject($parent_prefix);
+ $parent_object = $this->Application->recallObject($parent_prefix);
/* @var $parent_object kDBItem */
$object->SetDBField('ResourceId', $parent_object->GetDBField('ResourceId'));
Index: units/fck/fck_eh.php
===================================================================
--- units/fck/fck_eh.php (revision 15130)
+++ units/fck/fck_eh.php (working copy)
@@ -73,7 +73,7 @@
{
$event->status = kEvent::erSTOP;
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
$pages = $category_helper->getStructureTreeAsOptions();
@@ -122,7 +122,7 @@
return;
}
- $fck_helper =& $this->Application->recallObject('FCKHelper');
+ $fck_helper = $this->Application->recallObject('FCKHelper');
/* @var $fck_helper fckFCKHelper*/
if ( !$fck_helper->IsAllowedExtension($folder, $new_name) ) {
@@ -165,7 +165,7 @@
{
$this->CreateXmlHeader();
- $fck_helper =& $this->Application->recallObject('FCKHelper');
+ $fck_helper = $this->Application->recallObject('FCKHelper');
/* @var $fck_helper fckFCKHelper */
$ret = ''."\n" ;
@@ -229,7 +229,7 @@
return;
}
- $fck_helper =& $this->Application->recallObject('FCKHelper');
+ $fck_helper = $this->Application->recallObject('FCKHelper');
/* @var $fck_helper fckFCKHelper*/
$fck_helper->UploadFile();
@@ -242,7 +242,7 @@
*/
function OnGetsEditorStyles($event)
{
- $minify_helper =& $this->Application->recallObject('MinifyHelper');
+ $minify_helper = $this->Application->recallObject('MinifyHelper');
/* @var $minify_helper MinifyHelper */
$this->Application->InitParser();
Index: units/fck/fck_tp.php
===================================================================
--- units/fck/fck_tp.php (revision 15111)
+++ units/fck/fck_tp.php (working copy)
@@ -18,7 +18,7 @@
protected function CheckCreateDefaultFolders(Array $params)
{
- $fck_helper =& $this->Application->recallObject('FCKHelper');
+ $fck_helper = $this->Application->recallObject('FCKHelper');
/* @var $fck_helper fckFCKHelper */
$default_folders = defined('FCK_DEFAULT_FOLDERS') ? FCK_DEFAULT_FOLDERS : Array ('Files', 'Images', 'Flash', 'Media', 'Documents');
Index: units/files/file_eh.php
===================================================================
--- units/files/file_eh.php (revision 15130)
+++ units/files/file_eh.php (working copy)
@@ -100,7 +100,7 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$filename = $object->GetField('FilePath', 'full_path');
Index: units/filters/item_filter_eh.php
===================================================================
--- units/filters/item_filter_eh.php (revision 15130)
+++ units/filters/item_filter_eh.php (working copy)
@@ -147,7 +147,7 @@
}
if ( $object->isLoaded() ) {
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
Index: units/filters/item_filter_tp.php
===================================================================
--- units/filters/item_filter_tp.php (revision 15111)
+++ units/filters/item_filter_tp.php (working copy)
@@ -50,7 +50,7 @@
// get item list to be filtered
$this->Application->ProcessParsedTag($params['prefix'], 'InitList', $params);
- $tag_processor =& $this->Application->recallTagProcessor( $params['prefix'] );
+ $tag_processor = $this->Application->recallTagProcessor( $params['prefix'] );
$item_list = $tag_processor->GetList($params);
$filter_type = $object->GetDBField('FilterType');
Index: units/forms/drafts/draft_eh.php
===================================================================
--- units/forms/drafts/draft_eh.php (revision 15130)
+++ units/forms/drafts/draft_eh.php (working copy)
@@ -45,7 +45,7 @@
public function getPassedID(kEvent $event)
{
if ( $event->Special == 'related' ) {
- $form_submission =& $this->Application->recallObject('formsubs');
+ $form_submission = $this->Application->recallObject('formsubs');
/* @var $form_submission kDBItem */
return Array (
Index: units/forms/form_fields/form_fields_tp.php
===================================================================
--- units/forms/form_fields/form_fields_tp.php (revision 15111)
+++ units/forms/form_fields/form_fields_tp.php (working copy)
@@ -21,7 +21,7 @@
$object =& $this->getObject($params);
$source_prefix = $this->Application->Parser->GetParam('SourcePrefix');
- $source_tp =& $this->Application->recallTagProcessor($source_prefix);
+ $source_tp = $this->Application->recallTagProcessor($source_prefix);
$params['name'] = 'fld_'.$object->GetDBField('FormFieldId');
if (isset($params['verify'])) $params['name'] .= '_verify';
return $source_tp->InputName($params);
@@ -51,7 +51,7 @@
return ;
}
- $submission =& $this->Application->recallObject( $block_params['SourcePrefix'] );
+ $submission = $this->Application->recallObject( $block_params['SourcePrefix'] );
/* @var $submission kDBItem */
$options = $submission->GetFieldOptions('fld_' . $object->GetID());
Index: units/forms/form_submissions/form_submission_tp.php
===================================================================
--- units/forms/form_submissions/form_submission_tp.php (revision 15111)
+++ units/forms/form_submissions/form_submission_tp.php (working copy)
@@ -45,7 +45,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper');
+ $form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
/* @var $form_submission_helper FormSubmissionHelper */
$formatted = !(array_key_exists('db', $params) && $params['db']);
Index: units/forms/form_submissions/form_submissions_eh.php
===================================================================
--- units/forms/form_submissions/form_submissions_eh.php (revision 15130)
+++ units/forms/form_submissions/form_submissions_eh.php (working copy)
@@ -89,7 +89,7 @@
$conf_fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
$conf_grids = $this->Application->getUnitOption($event->Prefix, 'Grids');
- $helper =& $this->Application->recallObject('InpCustomFieldsHelper');
+ $helper = $this->Application->recallObject('InpCustomFieldsHelper');
/* @var $helper InpCustomFieldsHelper */
$sql = 'SELECT *
@@ -235,7 +235,7 @@
// allows user to view only it's last submission
$this->Application->StoreVar('last_submission_id', $object->GetID());
- $form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper');
+ $form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
/* @var $form_submission_helper FormSubmissionHelper */
$form =& $form_submission_helper->getForm($object);
@@ -259,7 +259,7 @@
$event->SetRedirectParam('opener', 's');
$event->SetRedirectParam('m_cat_id', 0);
- $theme =& $this->Application->recallObject('theme.current');
+ $theme = $this->Application->recallObject('theme.current');
/* @var $theme kDBItem */
$template = kUtil::unhtmlentities($this->Application->GetVar('success_template')); // kHTTPQuery do htmlspecialchars on everything
@@ -295,14 +295,14 @@
$object->SetDBField('ReferrerURL', $referrer);
}
- $form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper');
+ $form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
/* @var $form_submission_helper FormSubmissionHelper */
$form =& $form_submission_helper->getForm($object);
// validate captcha code
if ( $form->GetDBField('UseSecurityImage') && !$this->Application->LoggedIn() ) {
- $captcha_helper =& $this->Application->recallObject('CaptchaHelper');
+ $captcha_helper = $this->Application->recallObject('CaptchaHelper');
/* @var $captcha_helper kCaptchaHelper */
$captcha_helper->validateCode($event, false);
@@ -412,7 +412,7 @@
return ;
}
- $merge_to =& $this->Application->recallObject($event->Prefix . '.merge-to', null, Array ('skip_autoload' => true));
+ $merge_to = $this->Application->recallObject($event->Prefix . '.merge-to', null, Array ('skip_autoload' => true));
/* @var $merge_to kDBItem */
$sql = $merge_to->GetSelectSQL() . ' WHERE (FormId = ' . $form_id . ') AND (' . $email_field . ' = ' . $this->Conn->qstr( $object->GetDBField($email_field) ) . ')';
@@ -430,7 +430,7 @@
$name_field = $this->getFieldByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_NAME);
$subject_field = $this->getFieldByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT);
- $language =& $this->Application->recallObject('lang.current');
+ $language = $this->Application->recallObject('lang.current');
/* @var $language kDBItem */
$date_format = $language->GetDBField('DateFormat');
@@ -512,7 +512,7 @@
WHERE FormId = ' . $form_id;
$form_info = $this->Conn->GetRow($sql);
- $reply =& $this->Application->recallObject('submission-log.merge', null, Array ('skip_autoload' => true));
+ $reply = $this->Application->recallObject('submission-log.merge', null, Array ('skip_autoload' => true));
/* @var $reply kDBItem */
$email_field = $this->getFieldByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
Index: units/forms/forms/forms_eh.php
===================================================================
--- units/forms/forms/forms_eh.php (revision 15130)
+++ units/forms/forms/forms_eh.php (working copy)
@@ -328,7 +328,7 @@
$connection_info[ strtolower($field) ] = $object->GetDBField($mode . $field);
}
- $pop3_helper =& $this->Application->makeClass('POP3Helper', Array ($connection_info, 10));
+ $pop3_helper = $this->Application->makeClass('POP3Helper', Array ($connection_info, 10));
/* @var $pop3_helper POP3Helper */
switch ( $pop3_helper->initMailbox(true) ) {
@@ -425,7 +425,7 @@
WHERE EnableEmailCommunication = 1';
$forms = $this->Conn->Query($sql, $id_field);
- $mailbox_helper =& $this->Application->recallObject('MailboxHelper');
+ $mailbox_helper = $this->Application->recallObject('MailboxHelper');
/* @var $mailbox_helper MailboxHelper */
$field_prefix = $bounce_mode ? 'Bounce' : 'Reply';
@@ -457,7 +457,7 @@
function isValidRecipient($params)
{
- $mailbox_helper =& $this->Application->recallObject('MailboxHelper');
+ $mailbox_helper = $this->Application->recallObject('MailboxHelper');
/* @var $mailbox_helper MailboxHelper */
$recipients = $mailbox_helper->getRecipients();
@@ -490,7 +490,7 @@
if ($params['bounce_mode']) {
// mark original message as bounced
- $mailbox_helper =& $this->Application->recallObject('MailboxHelper');
+ $mailbox_helper = $this->Application->recallObject('MailboxHelper');
/* @var $mailbox_helper MailboxHelper */
if (!array_key_exists('attachments', $mailbox_helper->parsedMessage)) {
@@ -504,7 +504,7 @@
switch ($attachment['headers']['content-type']) {
case 'message/delivery-status':
// save as BounceInfo
- $mime_decode_helper =& $this->Application->recallObject('MimeDecodeHelper');
+ $mime_decode_helper = $this->Application->recallObject('MimeDecodeHelper');
/* @var $mime_decode_helper MimeDecodeHelper */
$charset = $mailbox_helper->parsedMessage[ $fields_hash['MessageType'] ][0]['charset'];
@@ -563,7 +563,7 @@
// remove object, because it's linked to single form upon creation forever
$this->Application->removeObject('formsubs.-item');
- $form_submission =& $this->Application->recallObject('formsubs.-item', null, Array ('skip_autoload' => true));
+ $form_submission = $this->Application->recallObject('formsubs.-item', null, Array ('skip_autoload' => true));
/* @var $form_submission kDBItem */
// in case that other non-role mapped fields are required
@@ -591,7 +591,7 @@
return false;
}
- $reply_to =& $this->Application->recallObject('submission-log.-reply-to', null, Array ('skip_autoload' => true));
+ $reply_to = $this->Application->recallObject('submission-log.-reply-to', null, Array ('skip_autoload' => true));
/* @var $reply_to kDBItem */
$reply_to->Load($regs[2], 'VerifyCode');
@@ -611,7 +611,7 @@
return true;
}
- $reply =& $this->Application->recallObject('submission-log.-reply', null, Array ('skip_autoload' => true));
+ $reply = $this->Application->recallObject('submission-log.-reply', null, Array ('skip_autoload' => true));
/* @var $reply kDBItem */
$reply->SetDBFieldsFromHash($fields_hash);
Index: units/forms/submission_log/submission_log_eh.php
===================================================================
--- units/forms/submission_log/submission_log_eh.php (revision 15130)
+++ units/forms/submission_log/submission_log_eh.php (working copy)
@@ -78,10 +78,10 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $form_submission =& $this->Application->recallObject('formsubs');
+ $form_submission = $this->Application->recallObject('formsubs');
/* @var $form_submission kDBItem */
- $form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper');
+ $form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
/* @var $form_submission_helper FormSubmissionHelper */
$form =& $form_submission_helper->getForm($form_submission);
@@ -106,7 +106,7 @@
$ids = $this->StoreSelectedIDs($event);
if ( $ids ) {
- $org_message =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+ $org_message = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
/* @var $org_message kDBItem */
$org_message->Load(array_shift($ids));
@@ -280,7 +280,7 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $esender =& $this->Application->recallObject('EmailSender');
+ $esender = $this->Application->recallObject('EmailSender');
/* @var $esender kEmailSendingHelper */
$cc = $object->GetDBField('Cc');
@@ -331,7 +331,7 @@
$form_submission =& $this->_getFormSubmission($object);
- $form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper');
+ $form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
/* @var $form_submission_helper FormSubmissionHelper */
$form =& $form_submission_helper->getForm($form_submission);
@@ -352,7 +352,7 @@
$send_params['to_name'] = $to_name;
}
- $esender =& $this->Application->recallObject('EmailSender');
+ $esender = $this->Application->recallObject('EmailSender');
/* @var $esender kEmailSendingHelper */
$esender->SetReturnPath( $form->GetDBField('BounceEmail') );
@@ -392,7 +392,7 @@
$object->SetDBField('BounceDate_time', NULL);
if ($object->GetDBField('DraftId')) {
- $temp_handler =& $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems('draft', '', Array ($object->GetDBField('DraftId')));
@@ -428,7 +428,7 @@
if ( $reply_to ) {
// this is reply to other message -> mark it as replied
- $org_message =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+ $org_message = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
/* @var $org_message kDBItem */
$org_message->Load($reply_to);
@@ -456,7 +456,7 @@
$form_submission =& $this->_getFormSubmission($object);
- $form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper');
+ $form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
/* @var $form_submission_helper FormSubmissionHelper */
$form =& $form_submission_helper->getForm($form_submission);
@@ -529,7 +529,7 @@
{
$submission_id = $object->GetDBField('FormSubmissionId');
- $form_submission =& $this->Application->recallObject('formsubs.-item', null, Array ('skip_autoload' => true));
+ $form_submission = $this->Application->recallObject('formsubs.-item', null, Array ('skip_autoload' => true));
/* @var $form_submission kDBItem */
if ($form_submission->isLoaded() && ($form_submission->GetID() == $submission_id)) {
@@ -564,7 +564,7 @@
}
// 2. update submission status
- $form_submission_helper =& $this->Application->recallObject('FormSubmissionHelper');
+ $form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
/* @var $form_submission_helper FormSubmissionHelper */
$form =& $form_submission_helper->getForm($form_submission);
@@ -598,7 +598,7 @@
$object =& $event->getObject( Array('skip_autoload' => true) );
/* @var $object kDBItem */
- $draft =& $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
+ $draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
/* @var $draft kDBItem */
$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
@@ -641,7 +641,7 @@
$object =& $event->getObject( Array('skip_autoload' => true) );
/* @var $object kDBItem */
- $draft =& $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
+ $draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
/* @var $draft kDBItem */
$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
@@ -678,7 +678,7 @@
$object =& $event->getObject( Array('skip_autoload' => true) );
/* @var $object kDBItem */
- $draft =& $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
+ $draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
/* @var $draft kDBItem */
$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
@@ -696,7 +696,7 @@
// get existing draft for given submission and user
$draft->Load($load_keys);
if ($draft->isLoaded()) {
- $temp_handler =& $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems('draft', '', Array ($draft->GetID()));
Index: units/forms/submission_log/submission_log_tp.php
===================================================================
--- units/forms/submission_log/submission_log_tp.php (revision 15111)
+++ units/forms/submission_log/submission_log_tp.php (working copy)
@@ -64,7 +64,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $draft =& $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
+ $draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
/* @var $draft kDBItem */
$load_keys = Array (
Index: units/helpers/ajax_form_helper.php
===================================================================
--- units/helpers/ajax_form_helper.php (revision 15130)
+++ units/helpers/ajax_form_helper.php (working copy)
@@ -53,7 +53,7 @@
*/
public function sendResponse($event, $response)
{
- $json_helper =& $this->Application->recallObject('JSONHelper');
+ $json_helper = $this->Application->recallObject('JSONHelper');
/* @var $json_helper JSONHelper */
echo $json_helper->encode($response);
Index: units/helpers/backup_helper.php
===================================================================
--- units/helpers/backup_helper.php (revision 15111)
+++ units/helpers/backup_helper.php (working copy)
@@ -51,7 +51,7 @@
*/
function initBackup()
{
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
if (!$file_helper->CheckFolder($this->path) || !is_writable($this->path)) {
@@ -501,7 +501,7 @@
*/
public function getBackupFiles()
{
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$ret = Array ();
Index: units/helpers/brackets_helper.php
===================================================================
--- units/helpers/brackets_helper.php (revision 15130)
+++ units/helpers/brackets_helper.php (working copy)
@@ -64,7 +64,7 @@
{
parent::__construct();
- $this->_language =& $this->Application->recallObject('lang.current');
+ $this->_language = $this->Application->recallObject('lang.current');
/* @var $lang kDBItem */
$this->_decimalSeparator = $this->_language->GetDBField('DecimalPoint');
Index: units/helpers/cat_dbitem_export_helper.php
===================================================================
--- units/helpers/cat_dbitem_export_helper.php (revision 15130)
+++ units/helpers/cat_dbitem_export_helper.php (working copy)
@@ -189,7 +189,7 @@
if ( $formatter_class ) {
// not tested
- $formatter =& $this->Application->recallObject($formatter_class);
+ $formatter = $this->Application->recallObject($formatter_class);
/* @var $formatter kFormatter */
$sample_value = $formatter->GetSample($field_name, $field_options, $object);
@@ -400,7 +400,7 @@
*/
function openFile($event)
{
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$file_helper->CheckFolder(EXPORT_PATH);
@@ -431,7 +431,7 @@
function getCustomSQL()
{
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
$custom_sql = '';
@@ -452,7 +452,7 @@
$sql = $this->exportOptions['ForceSelectSQL'];
}
else {
- $items_list =& $this->Application->recallObject($this->curItem->Prefix . '.export-items-list', $this->curItem->Prefix . '_List');
+ $items_list = $this->Application->recallObject($this->curItem->Prefix . '.export-items-list', $this->curItem->Prefix . '_List');
/* @var $items_list kDBList */
$items_list->SetPerPage(-1);
@@ -678,7 +678,7 @@
$this->addToCache('category_parent_path', $this->Application->GetVar('m_cat_id'), $this->exportOptions['ImportCategoryPath']);
// 2. import data
- $this->dummyCategory =& $this->Application->recallObject('c.-tmpitem', 'c', Array('skip_autoload' => true));
+ $this->dummyCategory = $this->Application->recallObject('c.-tmpitem', 'c', Array('skip_autoload' => true));
fseek($this->filePointer, $this->exportOptions['start_from']);
$items_processed = 0;
@@ -777,7 +777,7 @@
break;
case IMPORT_LIVE:
- $this->curItem =& $this->Application->recallObject($event->Prefix.'.-tmpitem'.$event->Special, $event->Prefix, Array('skip_autoload' => true));
+ $this->curItem = $this->Application->recallObject($event->Prefix.'.-tmpitem'.$event->Special, $event->Prefix, Array('skip_autoload' => true));
break;
}
$this->curItem->Clear();
@@ -1105,7 +1105,7 @@
$category_path = $this->getFromCache('category_path', $category_id);
if ( !$category_path ) {
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
$sql = 'SELECT ' . $ml_formatter->LangFieldName('CachedNavbar') . '
@@ -1281,7 +1281,7 @@
}
}
- $handler =& $this->Application->recallObject($event->Prefix.'_EventHandler');
+ $handler = $this->Application->recallObject($event->Prefix.'_EventHandler');
/* @var $handler kDBEventHandler */
$available_columns = array_merge($available_columns, $handler->getCustomExportColumns($event));
@@ -1387,7 +1387,7 @@
return ;
}
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$import_filenames = Array ();
Index: units/helpers/category_helper.php
===================================================================
--- units/helpers/category_helper.php (revision 15111)
+++ units/helpers/category_helper.php (working copy)
@@ -88,7 +88,7 @@
}
$module_prefix = $module_info['Var'];
- $object =& $this->Application->recallObject($module_prefix);
+ $object = $this->Application->recallObject($module_prefix);
/* @var $object kCatDBItem */
$title_field = $this->Application->getUnitOption($module_prefix, 'TitleField');
@@ -299,7 +299,7 @@
$cached_path = $this->Application->getCache($cache_key);
if ( $cached_path === false ) {
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
$navbar_field = $ml_formatter->LangFieldName('CachedNavBar');
@@ -495,7 +495,7 @@
}
// generate structure tree from scratch
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$languages = $ml_helper->getLanguages();
@@ -595,7 +595,7 @@
return $this->_structureTree;
}
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$data = $this->_getStructureTree();
Index: units/helpers/col_picker_helper.php
===================================================================
--- units/helpers/col_picker_helper.php (revision 15111)
+++ units/helpers/col_picker_helper.php (working copy)
@@ -183,7 +183,7 @@
// we NEED to recall dummy here to apply fields changes imposed by formatters,
// such as replacing multilingual field titles etc.
- $dummy =& $this->Application->recallObject($prefix, null, Array ('skip_autoload' => 1));
+ $dummy = $this->Application->recallObject($prefix, null, Array ('skip_autoload' => 1));
$counter = 0;
$hidden = array();
Index: units/helpers/controls/edit_picker_helper.php
===================================================================
--- units/helpers/controls/edit_picker_helper.php (revision 15130)
+++ units/helpers/controls/edit_picker_helper.php (working copy)
@@ -43,7 +43,7 @@
$object =& $event->getObject();
/* @var $object kDBList */
- $main_object =& $this->Application->recallObject($event->getEventParam('link_to_prefix'));
+ $main_object = $this->Application->recallObject($event->getEventParam('link_to_prefix'));
/* @var $main_object kDBItem */
$selected_items = $main_object->GetDBField($storage_field);
@@ -108,7 +108,7 @@
$affected_field = $main_object->GetDBField($store_field);
- $object =& $this->Application->recallObject($sub_event->getPrefixSpecial(), null, Array('skip_autoload' => true));
+ $object = $this->Application->recallObject($sub_event->getPrefixSpecial(), null, Array('skip_autoload' => true));
/* @var $object kDBItem */
$sub_table = $object->TableName;
Index: units/helpers/controls/minput_helper.php
===================================================================
--- units/helpers/controls/minput_helper.php (revision 15130)
+++ units/helpers/controls/minput_helper.php (working copy)
@@ -109,7 +109,7 @@
function parseMInputXML($xml)
{
- $xml_helper =& $this->Application->recallObject('kXMLHelper');
+ $xml_helper = $this->Application->recallObject('kXMLHelper');
/* @var $xml_helper kXMLHelper */
$root_node =& $xml_helper->Parse($xml);
@@ -152,7 +152,7 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $sub_item =& $this->Application->recallObject($sub_prefix, null, Array('skip_autoload' => true));
+ $sub_item = $this->Application->recallObject($sub_prefix, null, Array('skip_autoload' => true));
/* @var $sub_item kDBItem */
$foreign_key = $this->Application->getUnitOption($sub_prefix, 'ForeignKey');
@@ -201,7 +201,7 @@
$affected_field = $main_object->GetDBField($store_field);
- $object =& $this->Application->recallObject($sub_event->getPrefixSpecial(), null, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject($sub_event->getPrefixSpecial(), null, Array ('skip_autoload' => true));
/* @var $object kDBItem */
$sub_table = $object->TableName;
Index: units/helpers/csv_helper.php
===================================================================
--- units/helpers/csv_helper.php (revision 15111)
+++ units/helpers/csv_helper.php (working copy)
@@ -32,7 +32,7 @@
$export_rand = $this->Application->RecallVar('export_rand');
$get_rand = $this->Application->GetVar('export_rand');
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
if ( $export_data && $export_rand == $get_rand ) {
@@ -51,7 +51,7 @@
$export_data['record_separator'] = $this->separator_mapping[(int)$this->Application->ConfigValue('CSVExportSeparator')];
$export_data['page'] = 1;
- $lang_object =& $this->Application->recallObject('lang.current');
+ $lang_object = $this->Application->recallObject('lang.current');
/* @var $lang_object LanguagesItem */
$export_data['source_encoding'] = strtoupper($lang_object->GetDBField('Charset'));
@@ -69,14 +69,14 @@
$grid_config = $grids[$export_data['grid']]['Fields'];
$list_params = Array ('per_page' => $export_data['step'], 'grid' => $export_data['grid']);
- $list =& $this->Application->recallObject(rtrim(implode('.', $prefix_elems), '.'), $prefix_elems[0] . '_List', $list_params);
+ $list = $this->Application->recallObject(rtrim(implode('.', $prefix_elems), '.'), $prefix_elems[0] . '_List', $list_params);
/* @var $list kDBList */
$list->SetPage($export_data['page']);
$list->Query();
$list->GoFirst();
- $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
+ $picker_helper = $this->Application->recallObject('ColumnPickerHelper');
/* @var $picker_helper kColumnPickerHelper */
$picker_helper->ApplyPicker(rtrim(implode('.', $prefix_elems), '.'), $grid_config, $export_data['grid']);
@@ -186,7 +186,7 @@
$import_data = Array();
- $lang_object =& $this->Application->recallObject('lang.current');
+ $lang_object = $this->Application->recallObject('lang.current');
/* @var $lang_object LanguagesItem */
$import_data['source_encoding'] = strtoupper( $lang_object->GetDBField('Charset') );
$import_data['encoding'] = $this->Application->ConfigValue('CSVExportEncoding') ? false : 'UTF-16LE';
@@ -271,7 +271,7 @@
$import_data = unserialize($this->Application->RecallVar('import_data'));
$prefix_elems = preg_split('/\.|_/', $import_data['prefix'], 2);
- $object =& $this->Application->recallObject($prefix_elems[0].'.-csvimport', $prefix_elems[0], Array('skip_autoload' => true, 'populate_ml_fields' => true));
+ $object = $this->Application->recallObject($prefix_elems[0].'.-csvimport', $prefix_elems[0], Array('skip_autoload' => true, 'populate_ml_fields' => true));
/* @var $object kDBItem */
$file = fopen($import_data['file'], 'r');
Index: units/helpers/deployment_helper.php
===================================================================
--- units/helpers/deployment_helper.php (revision 15130)
+++ units/helpers/deployment_helper.php (working copy)
@@ -224,7 +224,7 @@
*/
private function importLanguagePack()
{
- $language_import_helper =& $this->Application->recallObject('LanguageImportHelper');
+ $language_import_helper = $this->Application->recallObject('LanguageImportHelper');
/* @var $language_import_helper LanguageImportHelper */
echo 'Importing LanguagePack ... ';
Index: units/helpers/filenames_helper.php
===================================================================
--- units/helpers/filenames_helper.php (revision 15111)
+++ units/helpers/filenames_helper.php (working copy)
@@ -44,7 +44,7 @@
$this->_escapeChar = $this->Application->ConfigValue('FilenameSpecialCharReplacement');
- $language =& $this->Application->recallObject('lang.primary');
+ $language = $this->Application->recallObject('lang.primary');
/* @var $language kDBItem */
$replacements = $language->GetDBField('FilenameReplacements');
Index: units/helpers/form_submission_helper.php
===================================================================
--- units/helpers/form_submission_helper.php (revision 15111)
+++ units/helpers/form_submission_helper.php (working copy)
@@ -112,7 +112,7 @@
{
$form_id = $form_submission->GetDBField('FormId');
- $form =& $this->Application->recallObject('form', null, Array ('skip_autoload' => true));
+ $form = $this->Application->recallObject('form', null, Array ('skip_autoload' => true));
/* @var $form kDBItem */
if ( !$form->isLoaded() || ($form->GetID() != $form_id) ) {
Index: units/helpers/geocode_helper.php
===================================================================
--- units/helpers/geocode_helper.php (revision 15111)
+++ units/helpers/geocode_helper.php (working copy)
@@ -85,7 +85,7 @@
$request_url = $this->Application->ConfigValue('GoogleMapsURL').'output=xml&key='.
$this->Application->ConfigValue('GoogleMapsKey').'&q='.urlencode($qaddress);
- $curl_helper =& $this->Application->recallObject('CurlHelper');
+ $curl_helper = $this->Application->recallObject('CurlHelper');
/* @var $curl_helper kCurlHelper */
$delay = 0;
Index: units/helpers/image_helper.php
===================================================================
--- units/helpers/image_helper.php (revision 15111)
+++ units/helpers/image_helper.php (working copy)
@@ -27,7 +27,7 @@
{
parent::__construct();
- $this->fileHelper =& $this->Application->recallObject('FileHelper');
+ $this->fileHelper = $this->Application->recallObject('FileHelper');
}
/**
Index: units/helpers/language_import_helper.php
===================================================================
--- units/helpers/language_import_helper.php (revision 15116)
+++ units/helpers/language_import_helper.php (working copy)
@@ -132,7 +132,7 @@
set_time_limit(0);
ini_set('memory_limit', -1);
- $this->lang_object =& $this->Application->recallObject('lang.import', null, Array ('skip_autoload' => true));
+ $this->lang_object = $this->Application->recallObject('lang.import', null, Array ('skip_autoload' => true));
if (!(defined('IS_INSTALL') && IS_INSTALL)) {
// perform only, when not in installation mode
@@ -223,7 +223,7 @@
$export_fields = $this->_getExportFields();
- $email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
+ $email_message_helper = $this->Application->recallObject('EmailMessageHelper');
/* @var $email_message_helper EmailMessageHelper */
// get languages
@@ -599,7 +599,7 @@
$fdata = file_get_contents($filename);
- $xml_parser =& $this->Application->recallObject('kXMLHelper');
+ $xml_parser = $this->Application->recallObject('kXMLHelper');
/* @var $xml_parser kXMLHelper */
$root_node =& $xml_parser->Parse($fdata);
@@ -905,7 +905,7 @@
$this->Application->Debugger->profileStart('L[' . $language_id . ']E', 'Language: ' . $language_id . '; Events Import');
}
- $email_message_helper =& $this->Application->recallObject('EmailMessageHelper');
+ $email_message_helper = $this->Application->recallObject('EmailMessageHelper');
/* @var $email_message_helper EmailMessageHelper */
do {
@@ -1140,7 +1140,7 @@
'per_page' => -1
);
- $list =& $this->Application->recallObject($prefix, $prefix . '_List', $tag_params);
+ $list = $this->Application->recallObject($prefix, $prefix . '_List', $tag_params);
/* @var $list kDBList */
$sql = $list->getCountSQL($list->GetSelectSQL());
Index: units/helpers/list_helper.php
===================================================================
--- units/helpers/list_helper.php (revision 15111)
+++ units/helpers/list_helper.php (working copy)
@@ -151,7 +151,7 @@
*/
function getNavigationResource(&$object, $list_prefix, $next = true, $select_fields = null)
{
- $list =& $this->Application->recallObject($list_prefix);
+ $list = $this->Application->recallObject($list_prefix);
/* @var $list kDBList */
if ( !isset($select_fields) ) {
Index: units/helpers/mailbox_helper.php
===================================================================
--- units/helpers/mailbox_helper.php (revision 15111)
+++ units/helpers/mailbox_helper.php (working copy)
@@ -46,7 +46,7 @@
*/
function process($connection_info, $verify_callback, $process_callback, $callback_params = Array (), $include_attachment_contents = true)
{
- $pop3_helper =& $this->Application->makeClass('POP3Helper', Array ($connection_info));
+ $pop3_helper = $this->Application->makeClass('POP3Helper', Array ($connection_info));
/* @var $pop3_helper POP3Helper */
$connection_status = $pop3_helper->initMailbox();
@@ -238,7 +238,7 @@
return false;
}
- $esender =& $this->Application->recallObject('EmailSender');
+ $esender = $this->Application->recallObject('EmailSender');
/* @var $esender kEmailSendingHelper */
// Get the return address
@@ -306,7 +306,7 @@
$message_body = $esender->ConvertToText($message_body);
}
- $mime_decode_helper =& $this->Application->recallObject('MimeDecodeHelper');
+ $mime_decode_helper = $this->Application->recallObject('MimeDecodeHelper');
/* @var $mime_decode_helper MimeDecodeHelper */
// convert to site encoding
@@ -370,7 +370,7 @@
{
$message = preg_replace("/\r?\n/", "\r\n", trim($message));
- $mime_decode_helper =& $this->Application->recallObject('MimeDecodeHelper');
+ $mime_decode_helper = $this->Application->recallObject('MimeDecodeHelper');
/* @var $mime_decode_helper MimeDecodeHelper */
// 1. separate headers from bodies
Index: units/helpers/mailing_list_helper.php
===================================================================
--- units/helpers/mailing_list_helper.php (revision 15111)
+++ units/helpers/mailing_list_helper.php (working copy)
@@ -27,7 +27,7 @@
*/
function queueEmail($email, $mailing_id, &$mailing_data)
{
- $esender =& $this->Application->recallObject('EmailSender');
+ $esender = $this->Application->recallObject('EmailSender');
/* @var $esender kEmailSendingHelper */
if ($this->_mailingId != $mailing_id) {
@@ -82,7 +82,7 @@
$email_address = $name = '';
if ( $mailing_data['PortalUserId'] > 0 ) {
- $sender =& $this->Application->recallObject('u.-item', null, Array ('skip_autoload' => true));
+ $sender = $this->Application->recallObject('u.-item', null, Array ('skip_autoload' => true));
/* @var $sender UsersItem */
$sender->Load($mailing_data['PortalUserId']);
@@ -262,7 +262,7 @@
*/
function processQueue(&$messages)
{
- $esender =& $this->Application->recallObject('EmailSender');
+ $esender = $this->Application->recallObject('EmailSender');
/* @var $esender kEmailSendingHelper */
$queue_table = $this->Application->getUnitOption('email-queue', 'TableName');
Index: units/helpers/menu_helper.php
===================================================================
--- units/helpers/menu_helper.php (revision 15111)
+++ units/helpers/menu_helper.php (working copy)
@@ -175,7 +175,7 @@
{
$cat = isset($params['category_id']) && $params['category_id'] != '' ? $params['category_id'] : $this->Application->GetVar('m_cat_id');
if ("$cat" == 'parent') {
- $this_category =& $this->Application->recallObject('c');
+ $this_category = $this->Application->recallObject('c');
/* @var $this_category kDBItem */
$cat = $this_category->GetDBField('ParentId');
@@ -287,7 +287,7 @@
static $lang_part = null;
if (!isset($lang_part)) {
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$lang_part = '';
@@ -335,7 +335,7 @@
static $items_by_parent = null;
if (!isset($items_by_parent)) {
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$lang_part = '';
Index: units/helpers/mime_decode_helper.php
===================================================================
--- units/helpers/mime_decode_helper.php (revision 15111)
+++ units/helpers/mime_decode_helper.php (working copy)
@@ -228,7 +228,7 @@
case 'message/rfc822':
case 'message/disposition-notification':
// create another instance, not to interfear with main parser
- $mime_decode_helper =& $this->Application->makeClass('MimeDecodeHelper');
+ $mime_decode_helper = $this->Application->makeClass('MimeDecodeHelper');
/* @var $mime_decode_helper MimeDecodeHelper */
$mime_decode_helper->InitHelper($body);
@@ -440,7 +440,7 @@
static $to_encoding = false;
if ($to_encoding === false) {
- $language =& $this->Application->recallObject('lang.current');
+ $language = $this->Application->recallObject('lang.current');
/* @var $language LanguagesItem */
$to_encoding = $language->GetDBField('Charset');
}
Index: units/helpers/minifiers/minify_helper.php
===================================================================
--- units/helpers/minifiers/minify_helper.php (revision 15111)
+++ units/helpers/minifiers/minify_helper.php (working copy)
@@ -121,7 +121,7 @@
file_put_contents($dst_file, $string);
}
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
return $file_helper->pathToUrl($dst_file) . '?ts=' . adodb_date('Y-m-d_H:i:s', filemtime($dst_file));
@@ -241,7 +241,7 @@
*/
protected function compressViaPHP(&$string, $extension)
{
- $minifier =& $this->Application->makeClass($extension == 'js' ? 'JsMinifyHelper' : 'CssMinifyHelper');
+ $minifier = $this->Application->makeClass($extension == 'js' ? 'JsMinifyHelper' : 'CssMinifyHelper');
/* @var $minifier JsMinifyHelper */
$string = $minifier->minify($string);
Index: units/helpers/mod_rewrite_helper.php
===================================================================
--- units/helpers/mod_rewrite_helper.php (revision 15111)
+++ units/helpers/mod_rewrite_helper.php (working copy)
@@ -36,7 +36,7 @@
}
if (!$parsed) {
- $rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+ $rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
/* @var $rewrite_processor kRewriteUrlProcessor */
$module_prefix = $this->_parseCategoryItemUrl($url_parts, $params);
@@ -65,7 +65,7 @@
{
static $default_per_page = Array ();
- $rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+ $rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
/* @var $rewrite_processor kRewriteUrlProcessor */
$ret = '';
@@ -77,7 +77,7 @@
}
if (!array_key_exists($prefix, $default_per_page)) {
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
$default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix);
@@ -146,7 +146,7 @@
return true;
}
- $rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+ $rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
/* @var $rewrite_processor kRewriteUrlProcessor */
$ret = '';
@@ -158,7 +158,7 @@
}
if (!array_key_exists($prefix, $default_per_page)) {
- $list_helper =& $this->Application->recallObject('ListHelper');
+ $list_helper = $this->Application->recallObject('ListHelper');
/* @var $list_helper ListHelper */
$default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix);
@@ -251,7 +251,7 @@
return false;
}
- $rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+ $rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
/* @var $rewrite_processor kRewriteUrlProcessor */
if ( preg_match('/^bb_([\d]+)/', $item_filename, $regs) ) {
@@ -311,7 +311,7 @@
*/
protected function _parseTopicUrl($topic_id, &$vars)
{
- $rewrite_processor =& $this->Application->recallObject('kRewriteUrlProcessor');
+ $rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
/* @var $rewrite_processor kRewriteUrlProcessor */
$sql = 'SELECT c.ParentPath, c.CategoryId
Index: units/helpers/modules_helper.php
===================================================================
--- units/helpers/modules_helper.php (revision 15111)
+++ units/helpers/modules_helper.php (working copy)
@@ -53,7 +53,7 @@
function _EnableCookieSID()
{
- $session =& $this->Application->recallObject('Session');
+ $session = $this->Application->recallObject('Session');
/* @var $session Session */
return $session->CookiesEnabled;
Index: units/helpers/page_helper.php
===================================================================
--- units/helpers/page_helper.php (revision 15111)
+++ units/helpers/page_helper.php (working copy)
@@ -43,7 +43,7 @@
if ( $history_permission ) {
$tag_params = Array ('per_page' => -1, 'skip_parent_filter' => 1, 'requery' => 1, 'page_id' => $page_id);
- $revisions =& $this->Application->recallObject('page-revision.list', 'page-revision_List', $tag_params);
+ $revisions = $this->Application->recallObject('page-revision.list', 'page-revision_List', $tag_params);
/* @var $revisions kDBList */
$revisions->Query();
@@ -71,7 +71,7 @@
}
}
- $current_revision =& $this->Application->recallObject('page-revision.current');
+ $current_revision = $this->Application->recallObject('page-revision.current');
/* @var $current_revision kDBItem */
$revision_status = $current_revision->GetDBField('Status');
@@ -212,7 +212,7 @@
if ( !$revisions ) {
// no revisions for a page -> create a live revision
- $revision =& $this->Application->recallObject('page-revision.live', null, Array ('skip_autoload' => true));
+ $revision = $this->Application->recallObject('page-revision.live', null, Array ('skip_autoload' => true));
/* @var $revision kDBItem */
$revision->SetDBField('PageId', $page_id);
@@ -223,7 +223,7 @@
$revisions[ $revision->GetID() ] = NULL;
}
- $content_block =& $this->Application->recallObject('content.new', null, Array ('skip_autoload' => true));
+ $content_block = $this->Application->recallObject('content.new', null, Array ('skip_autoload' => true));
/* @var $content_block kDBItem */
$content_block->SetDBField('PageId', $page_id);
Index: units/helpers/permissions_helper.php
===================================================================
--- units/helpers/permissions_helper.php (revision 15130)
+++ units/helpers/permissions_helper.php (working copy)
@@ -185,7 +185,7 @@
);
$top_prefix = $event->getEventParam('top_prefix');
- $event_handler =& $this->Application->recallObject($event->Prefix . '_EventHandler');
+ $event_handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
/* @var $event_handler kCatDBEventHandler */
$raise_warnings = $event->getEventParam('raise_warnings');
@@ -439,7 +439,7 @@
// check permission by event name
list ($prefix, ) = explode(':', $perm_event);
- $event_handler =& $this->Application->recallObject($prefix . '_EventHandler');
+ $event_handler = $this->Application->recallObject($prefix . '_EventHandler');
/* @var $event_handler kEventHandler */
return $event_handler->CheckPermission( new kEvent($perm_event) );
Index: units/helpers/priority_helper.php
===================================================================
--- units/helpers/priority_helper.php (revision 15130)
+++ units/helpers/priority_helper.php (working copy)
@@ -230,7 +230,7 @@
{
$ids = array_unique($ids);
- $dummy =& $this->Application->recallObject($prefix . '.-dummy', null, Array ('skip_autoload' => true));
+ $dummy = $this->Application->recallObject($prefix . '.-dummy', null, Array ('skip_autoload' => true));
/* @var $dummy kDBItem */
$sql = $dummy->GetSelectSQL() . '
Index: units/helpers/rating_helper.php
===================================================================
--- units/helpers/rating_helper.php (revision 15111)
+++ units/helpers/rating_helper.php (working copy)
@@ -253,7 +253,7 @@
*/
protected function &_getSpamHelper(&$object)
{
- $spam_helper =& $this->Application->recallObject('SpamHelper');
+ $spam_helper = $this->Application->recallObject('SpamHelper');
/* @var $spam_helper SpamHelper */
// 2. user isn't voting too frequently
Index: units/helpers/recursive_helper.php
===================================================================
--- units/helpers/recursive_helper.php (revision 15111)
+++ units/helpers/recursive_helper.php (working copy)
@@ -38,7 +38,7 @@
WHERE ('.$id_field.' = '.$category_id.') AND (PrimaryCat = 0)';
$this->Conn->Query($sql);
- $temp_handler =& $this->Application->recallObject($prefix.'_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($prefix.'_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
// 2. delete items this have this category as primary
@@ -125,7 +125,7 @@
}
// 1. clone category
- $temp_handler =& $this->Application->recallObject($prefix . '_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($prefix . '_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler*/
$temp_handler->BuildTables($prefix, Array ($category_id));
$new_category_id = array_pop($temp_handler->CloneItems($prefix, '', Array ($category_id)));
@@ -143,7 +143,7 @@
continue;
}
- $item_object =& $this->Application->recallObject($item_prefix . '.-item', null, Array ('skip_autoload' => true));
+ $item_object = $this->Application->recallObject($item_prefix . '.-item', null, Array ('skip_autoload' => true));
/* @var $item_object kCatDBItem */
foreach ($resource_ids as $item_resource_id) {
Index: units/helpers/search_helper.php
===================================================================
--- units/helpers/search_helper.php (revision 15130)
+++ units/helpers/search_helper.php (working copy)
@@ -691,7 +691,7 @@
}
}
- $formatter =& $this->Application->recallObject($options['formatter']);
+ $formatter = $this->Application->recallObject($options['formatter']);
/* @var $formatter kFormatter */
$value_ts = $formatter->Parse($value[$type], $search_field, $object);
@@ -718,7 +718,7 @@
return $field_options['input_time_format'];
}
- $lang_current =& $this->Application->recallObject('lang.current');
+ $lang_current = $this->Application->recallObject('lang.current');
/* @var $lang_current LanguagesItem */
return $lang_current->GetDBField('InputTimeFormat');
@@ -748,16 +748,16 @@
*/
function SetComplexFilter($event, &$type_clauses, $types, $except_types)
{
- $includes_or_filter =& $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR));
+ $includes_or_filter = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR));
/* @var $includes_or_filter kMultipleFilter */
- $excepts_and_filter =& $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND));
+ $excepts_and_filter = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND));
/* @var $excepts_and_filter kMultipleFilter */
- $includes_or_filter_h =& $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR));
+ $includes_or_filter_h = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR));
/* @var $includes_or_filter_h kMultipleFilter */
- $excepts_and_filter_h =& $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND));
+ $excepts_and_filter_h = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND));
/* @var $excepts_and_filter_h kMultipleFilter */
if ( $types ) {
Index: units/helpers/skin_helper.php
===================================================================
--- units/helpers/skin_helper.php (revision 15111)
+++ units/helpers/skin_helper.php (working copy)
@@ -50,7 +50,7 @@
}
else {
// not found (try to compile on the fly)
- $skin =& $this->Application->recallObject('skin.-item', null, Array ('skip_autoload' => true));
+ $skin = $this->Application->recallObject('skin.-item', null, Array ('skip_autoload' => true));
/* @var $skin kDBItem */
$skin->Load(1, 'IsPrimary');
Index: units/helpers/template_helper.php
===================================================================
--- units/helpers/template_helper.php (revision 15111)
+++ units/helpers/template_helper.php (working copy)
@@ -83,7 +83,7 @@
$t = $this->Application->GetVar('source');
if (!$this->Application->TemplatesCache->TemplateExists($t)) {
- $cms_handler =& $this->Application->recallObject('st_EventHandler');
+ $cms_handler = $this->Application->recallObject('st_EventHandler');
/* @var $cms_handler CategoriesEventHandler */
$t = ltrim($cms_handler->GetDesignTemplate($t), '/');
Index: units/helpers/themes_helper.php
===================================================================
--- units/helpers/themes_helper.php (revision 15111)
+++ units/helpers/themes_helper.php (working copy)
@@ -159,7 +159,7 @@
$modules = Array ($module_name => $this->Application->ModuleInfo[$module_name]);
}
- $language_import_helper =& $this->Application->recallObject('LanguageImportHelper');
+ $language_import_helper = $this->Application->recallObject('LanguageImportHelper');
/* @var $language_import_helper LanguageImportHelper */
foreach ($modules as $module_name => $module_info) {
@@ -187,7 +187,7 @@
{
$template_aliases = Array ();
- $xml_parser =& $this->Application->recallObject('kXMLHelper');
+ $xml_parser = $this->Application->recallObject('kXMLHelper');
/* @var $xml_parser kXMLHelper */
foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
@@ -530,7 +530,7 @@
$this->Application->incrementCacheSerial('theme');
$this->Application->incrementCacheSerial('theme-file');
- $minify_helper =& $this->Application->recallObject('MinifyHelper');
+ $minify_helper = $this->Application->recallObject('MinifyHelper');
/* @var $minify_helper MinifyHelper */
$minify_helper->delete();
Index: units/helpers/user_helper.php
===================================================================
--- units/helpers/user_helper.php (revision 15130)
+++ units/helpers/user_helper.php (working copy)
@@ -60,7 +60,7 @@
if ($this->Application->isAdmin && ($username == 'root') || ($super_admin && $username == 'super-root')) {
$root_password = $this->Application->ConfigValue('RootPass');
- $password_formatter =& $this->Application->recallObject('kPasswordFormatter');
+ $password_formatter = $this->Application->recallObject('kPasswordFormatter');
/* @var $password_formatter kPasswordFormatter */
if ($root_password != $password_formatter->EncryptPassword($password, 'b38')) {
@@ -271,7 +271,7 @@
$this->event = new kEvent('u:OnLogout');
}
- $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
+ $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
/* @var $sync_manager UsersSyncronizeManager */
$sync_manager->performAction('LogoutUser');
@@ -281,7 +281,7 @@
$user_id = USER_GUEST;
$this->Application->SetVar('u.current_id', $user_id);
- $object =& $this->Application->recallObject('u.current', null, Array('skip_autoload' => true));
+ $object = $this->Application->recallObject('u.current', null, Array('skip_autoload' => true));
/* @var $object UsersItem */
$object->Load($user_id);
@@ -349,7 +349,7 @@
}
// synchronize login
- $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
+ $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
/* @var $sync_manager UsersSyncronizeManager */
$sync_manager->performAction('LoginUser', $username, $password);
@@ -415,7 +415,7 @@
{
$prefix_special = $this->Application->isAdmin ? 'u.current' : 'u'; // "u" used on front not to change theme
- $object =& $this->Application->recallObject($prefix_special, null, Array('skip_autoload' => true));
+ $object = $this->Application->recallObject($prefix_special, null, Array('skip_autoload' => true));
/* @var $object UsersItem */
return $object;
@@ -585,7 +585,7 @@
$email_to_restore = $prev_emails[$hash];
unset($prev_emails[$hash]);
- $object =& $this->Application->recallObject('u.email-restore', null, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject('u.email-restore', null, Array ('skip_autoload' => true));
/* @var $object UsersItem */
$object->Load($user_info['PortalUserId']);
Index: units/images/image_event_handler.php
===================================================================
--- units/images/image_event_handler.php (revision 15130)
+++ units/images/image_event_handler.php (working copy)
@@ -153,7 +153,7 @@
{
$id = $event->getEventParam('id');
- $object =& $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject($event->Prefix . '.-item', $event->Prefix, Array ('skip_autoload' => true));
/* @var $object kDBItem */
if ( in_array($event->Name, Array ('OnBeforeDeleteFromLive', 'OnAfterClone')) ) {
@@ -168,7 +168,7 @@
$object->Load($id);
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$fields = Array ('LocalPath' => 'LocalImage', 'ThumbPath' => 'LocalThumb');
@@ -354,7 +354,7 @@
$object->addFilter('product_images', '%1$s.ResourceId = ' . $resource_id);
}
- $search_helper =& $this->Application->recallObject('SearchHelper');
+ $search_helper = $this->Application->recallObject('SearchHelper');
/* @var $search_helper kSearchHelper */
$types = $event->getEventParam('types');
Index: units/images/image_tag_processor.php
===================================================================
--- units/images/image_tag_processor.php (revision 15111)
+++ units/images/image_tag_processor.php (working copy)
@@ -34,7 +34,7 @@
$parent_prefix = $this->Application->getUnitOption($object->Prefix, 'ParentPrefix');
- $parent_item =& $this->Application->recallObject($parent_prefix);
+ $parent_item = $this->Application->recallObject($parent_prefix);
/* @var $parent_item kDBItem */
$block_params['img_path'] = $image_url;
@@ -83,10 +83,10 @@
function LoadItemImage($params)
{
- $parent_item =& $this->Application->recallObject($params['PrefixSpecial']);
+ $parent_item = $this->Application->recallObject($params['PrefixSpecial']);
/* @var $parent_item kCatDBItem */
- $object =& $this->Application->recallObject($this->getPrefixSpecial(), null, Array('skip_autoload' => true));
+ $object = $this->Application->recallObject($this->getPrefixSpecial(), null, Array('skip_autoload' => true));
/* @var $object kDBItem */
$object->Clear();
@@ -241,7 +241,7 @@
list ($max_width, $max_height) = $this->_transformParams($params, $max_width, $max_height);
if ($object->isLoaded() && file_exists($src_image)) {
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
return $image_helper->ResizeImage($src_image, $max_width, $max_height);
@@ -281,7 +281,7 @@
return false;
}
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$dst_image = $file_helper->urlToPath($src_image);
@@ -369,7 +369,7 @@
$sub_folder = $this->Application->isAdmin ? rtrim(IMAGES_PATH, '/') : THEMES_PATH;
if (($max_width !== false) || ($max_height !== false)) {
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
$src_image = FULL_PATH . $sub_folder . '/' . $default_image;
@@ -388,7 +388,7 @@
// absolute url
if (preg_match('/^(.*):\/\/(.*)$/U', $path)) {
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
return $file_helper->urlToPath($path);
@@ -412,7 +412,7 @@
{
$img_path = $this->getFullPath($params['img_path']);
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
$max_width = $this->getImageDimension('Width', $params);
Index: units/languages/languages_event_handler.php
===================================================================
--- units/languages/languages_event_handler.php (revision 15130)
+++ units/languages/languages_event_handler.php (working copy)
@@ -97,7 +97,7 @@
}
}
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$ml_helper->massCreateFields();
@@ -253,7 +253,7 @@
// site domain language picker
if ( $event->Special == 'selected' || $event->Special == 'available' ) {
- $edit_picker_helper =& $this->Application->recallObject('EditPickerHelper');
+ $edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
/* @var $edit_picker_helper EditPickerHelper */
$edit_picker_helper->applyFilter($event, 'Languages');
@@ -324,7 +324,7 @@
}
// create multilingual columns for phrases & email events table first (actual for 6+ language)
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$ml_helper->createFields('phrases');
@@ -415,7 +415,7 @@
$this->Application->StorePersistentVar($language_field, $language_id);
}
else {
- $object =& $this->Application->recallObject('u.current');
+ $object = $this->Application->recallObject('u.current');
/* @var $object kDBItem */
$object->SetDBField($language_field, $language_id);
@@ -442,7 +442,7 @@
if ($items_info) {
list ($id, $field_values) = each($items_info);
- $object =& $this->Application->recallObject('phrases.import', 'phrases', Array('skip_autoload' => true));
+ $object = $this->Application->recallObject('phrases.import', 'phrases', Array('skip_autoload' => true));
/* @var $object kDBItem */
$object->setID($id);
@@ -460,7 +460,7 @@
$event->status = kEvent::erFAIL;
}
- $language_import_helper =& $this->Application->recallObject('LanguageImportHelper');
+ $language_import_helper = $this->Application->recallObject('LanguageImportHelper');
/* @var $language_import_helper LanguageImportHelper */
$language_import_helper->performImport(
@@ -513,7 +513,7 @@
$items_info = $this->Application->GetVar('phrases_export');
if ( $items_info ) {
list($id, $field_values) = each($items_info);
- $object =& $this->Application->recallObject('phrases.export', null, Array ('skip_autoload' => true));
+ $object = $this->Application->recallObject('phrases.export', null, Array ('skip_autoload' => true));
/* @var $object kDBItem */
$object->setID($id);
@@ -524,7 +524,7 @@
return;
}
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$file_helper->CheckFolder(EXPORT_PATH);
@@ -542,7 +542,7 @@
$filename = EXPORT_PATH . '/' . $field_values['LangFile'];
- $language_import_helper =& $this->Application->recallObject('LanguageImportHelper');
+ $language_import_helper = $this->Application->recallObject('LanguageImportHelper');
/* @var $language_import_helper LanguageImportHelper */
if ( $object->GetDBField('DoNotEncode') ) {
Index: units/languages/languages_item.php
===================================================================
--- units/languages/languages_item.php (revision 15111)
+++ units/languages/languages_item.php (working copy)
@@ -73,7 +73,7 @@
return ;
}
- $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+ $ml_helper = $this->Application->recallObject('kMultiLanguageHelper');
/* @var $ml_helper kMultiLanguageHelper */
$to_language = $this->GetID();
Index: units/languages/languages_tag_processor.php
===================================================================
--- units/languages/languages_tag_processor.php (revision 15111)
+++ units/languages/languages_tag_processor.php (working copy)
@@ -38,7 +38,7 @@
return $object->GetDBField('Charset');
}
- $lang_current =& $this->Application->recallObject('lang.current');
+ $lang_current = $this->Application->recallObject('lang.current');
/* @var $lang_current LanguagesItem */
return $lang_current->GetDBField('Charset');
@@ -136,7 +136,7 @@
/* function Main_IsMetricUnits($params)
{
- $object =& $this->Application->recallObject($this->Prefix.'.current');
+ $object = $this->Application->recallObject($this->Prefix.'.current');
$measure_system = $object->GetDBField('UnitSystem');
return $measure_system == 1 ? 1 : 0;
}*/
Index: units/logs/session_logs/session_log_eh.php
===================================================================
--- units/logs/session_logs/session_log_eh.php (revision 15130)
+++ units/logs/session_logs/session_log_eh.php (working copy)
@@ -28,7 +28,7 @@
return ;
}
- $object =& $this->Application->recallObject($event->Prefix, null, Array ('skip_autoload' => 1));
+ $object = $this->Application->recallObject($event->Prefix, null, Array ('skip_autoload' => 1));
/* @var $object kDBItem */
$fields_hash = Array (
@@ -55,7 +55,7 @@
*/
function OnEndSession($event)
{
- $object =& $this->Application->recallObject($event->Prefix, null, Array ('skip_autoload' => 1));
+ $object = $this->Application->recallObject($event->Prefix, null, Array ('skip_autoload' => 1));
/* @var $object kDBItem */
$object->Load($this->Application->RecallVar('_SessionLogId_'));
@@ -120,7 +120,7 @@
$related_ids = $this->Conn->GetCol($sql);
if ( $related_ids ) {
- $temp_handler =& $this->Application->recallObject('change-log_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject('change-log_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems('change-log', '', $related_ids);
Index: units/mailing_lists/mailing_list_eh.php
===================================================================
--- units/mailing_lists/mailing_list_eh.php (revision 15130)
+++ units/mailing_lists/mailing_list_eh.php (working copy)
@@ -262,7 +262,7 @@
return ;
}
- $mailing_list_helper =& $this->Application->recallObject('MailingListHelper');
+ $mailing_list_helper = $this->Application->recallObject('MailingListHelper');
/* @var $mailing_list_helper MailingListHelper */
foreach ($mailing_lists as $mailing_id => $mailing_data) {
@@ -332,7 +332,7 @@
return ;
}
- $mailing_list_helper =& $this->Application->recallObject('MailingListHelper');
+ $mailing_list_helper = $this->Application->recallObject('MailingListHelper');
/* @var $mailing_list_helper MailingListHelper */
$mailing_list_helper->processQueue($messages);
Index: units/mailing_lists/mailing_list_tp.php
===================================================================
--- units/mailing_lists/mailing_list_tp.php (revision 15111)
+++ units/mailing_lists/mailing_list_tp.php (working copy)
@@ -21,7 +21,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $mailing_list_helper =& $this->Application->recallObject('MailingListHelper');
+ $mailing_list_helper = $this->Application->recallObject('MailingListHelper');
/* @var $mailing_list_helper MailingListHelper */
// for each group convert ids to names
Index: units/modules/modules_event_handler.php
===================================================================
--- units/modules/modules_event_handler.php (revision 15130)
+++ units/modules/modules_event_handler.php (working copy)
@@ -147,7 +147,7 @@
{
parent::OnAfterListQuery($event);
- $modules_helper =& $this->Application->recallObject('ModulesHelper');
+ $modules_helper = $this->Application->recallObject('ModulesHelper');
/* @var $modules_helper kModulesHelper */
$new_modules = $modules_helper->getModules(kModulesHelper::NOT_INSTALLED);
Index: units/modules/modules_tag_processor.php
===================================================================
--- units/modules/modules_tag_processor.php (revision 15111)
+++ units/modules/modules_tag_processor.php (working copy)
@@ -36,7 +36,7 @@
$object =& $this->getObject($params);
/* @var $object kDBList */
- $modules_helper =& $this->Application->recallObject('ModulesHelper');
+ $modules_helper = $this->Application->recallObject('ModulesHelper');
/* @var $modules_helper kModulesHelper */
return $modules_helper->moduleInstalled( $object->GetDBField('Name') );
@@ -52,7 +52,7 @@
$object =& $this->getObject($params);
/* @var $object kDBList */
- $modules_helper =& $this->Application->recallObject('ModulesHelper');
+ $modules_helper = $this->Application->recallObject('ModulesHelper');
/* @var $modules_helper kModulesHelper */
$licensed_modules = array_map('strtolower', $modules_helper->_GetModules());
Index: units/page_revisions/page_revision_eh.php
===================================================================
--- units/page_revisions/page_revision_eh.php (revision 15130)
+++ units/page_revisions/page_revision_eh.php (working copy)
@@ -33,7 +33,7 @@
return $this->Application->isAdminUser;
}
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
if ( $event->Name == 'OnSave' ) {
@@ -91,10 +91,10 @@
public function getPassedID(kEvent $event)
{
if ( $event->Special == 'current' ) {
- $page =& $this->Application->recallObject('st.-virtual');
+ $page = $this->Application->recallObject('st.-virtual');
/* @var $page kDBItem */
- $page_helper =& $this->Application->recallObject('PageHelper');
+ $page_helper = $this->Application->recallObject('PageHelper');
/* @var $page_helper PageHelper */
$page_id = $page->GetID();
@@ -185,7 +185,7 @@
return ;
}
- $content =& $this->Application->recallObject('content.-item', null, Array ('skip_autoload' => true));
+ $content = $this->Application->recallObject('content.-item', null, Array ('skip_autoload' => true));
/* @var $content kDBItem */
$sql = $content->GetSelectSQL() . '
@@ -216,7 +216,7 @@
$status = $object->GetDBField('Status');
if ( $status != $object->GetOriginalField('Status') && $status == STATUS_ACTIVE ) {
- $page =& $this->Application->recallObject('c.revision', null, Array ('skip_autoload' => true));
+ $page = $this->Application->recallObject('c.revision', null, Array ('skip_autoload' => true));
/* @var $page kDBItem */
$page->Load($object->GetDBField('PageId'));
@@ -238,7 +238,7 @@
return ;
}
- $page_helper =& $this->Application->recallObject('PageHelper');
+ $page_helper = $this->Application->recallObject('PageHelper');
/* @var $page_helper PageHelper */
$page_id = $this->Application->GetVar('m_cat_id');
@@ -287,7 +287,7 @@
$revision_id = $this->getCurrentDraftRevision($event);
if ( $revision_id ) {
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($revision_id));
@@ -303,7 +303,7 @@
*/
function OnPublish($event)
{
- $revision =& $this->Application->recallObject('page-revision.current');
+ $revision = $this->Application->recallObject('page-revision.current');
/* @var $revision kDBItem */
if ( !$revision->isLoaded() || $revision->GetDBField('Status') == STATUS_ACTIVE || $revision->GetDBField('IsDraft') ) {
@@ -323,7 +323,7 @@
*/
function OnDecline($event)
{
- $revision =& $this->Application->recallObject('page-revision.current');
+ $revision = $this->Application->recallObject('page-revision.current');
/* @var $revision kDBItem */
if ( !$revision->isLoaded() || $revision->GetDBField('Status') == STATUS_DISABLED || $revision->GetDBField('IsLive') || $revision->GetDBField('IsDraft') ) {
Index: units/page_revisions/page_revision_tp.php
===================================================================
--- units/page_revisions/page_revision_tp.php (revision 15111)
+++ units/page_revisions/page_revision_tp.php (working copy)
@@ -21,7 +21,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $page_helper =& $this->Application->recallObject('PageHelper');
+ $page_helper = $this->Application->recallObject('PageHelper');
/* @var $page_helper PageHelper */
return $page_helper->getAgoTime( $object->GetDBField('AutoSavedOn') );
Index: units/permissions/permissions_event_handler.php
===================================================================
--- units/permissions/permissions_event_handler.php (revision 15130)
+++ units/permissions/permissions_event_handler.php (working copy)
@@ -49,7 +49,7 @@
$permissions = $permissions[$group_id];
$object =& $event->getObject( Array('skip_autoload' => true) );
- $permissions_helper =& $this->Application->recallObject('PermissionsHelper');
+ $permissions_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $permissions_helper kPermissionsHelper */
$permissions_helper->LoadPermissions($group_id, $category_id, 0, 'c');
@@ -122,7 +122,7 @@
/* @var $object kDBItem */
$group_id = $this->Application->GetVar('g_id');
- $permissions_helper =& $this->Application->recallObject('PermissionsHelper');
+ $permissions_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $permissions_helper kPermissionsHelper */
$permissions_helper->LoadPermissions($group_id, 0, 1, 'g');
@@ -136,7 +136,7 @@
}
--$new_id;
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
foreach ($permissions as $section_name => $section_permissions) {
@@ -252,7 +252,7 @@
if ( (count($foreign_keys) == 1) && ($foreign_keys[0] == 0) ) {
// parent item has zero id
- $temp_object =& $this->Application->recallObject('c');
+ $temp_object = $this->Application->recallObject('c');
/* @var $temp_object CategoriesItem */
if ( $temp_object->isLoaded() ) {
Index: units/permissions/permissions_tag_processor.php
===================================================================
--- units/permissions/permissions_tag_processor.php (revision 15111)
+++ units/permissions/permissions_tag_processor.php (working copy)
@@ -20,7 +20,7 @@
{
$section_name = $params['section_name'];
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($section_name);
@@ -32,7 +32,7 @@
{
$section_name = $params['section_name'];
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($section_name);
@@ -52,7 +52,7 @@
$section_name = $params['section_name'];
$perm_name = $params['perm_name'];
- $sections_helper =& $this->Application->recallObject('SectionsHelper');
+ $sections_helper = $this->Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
$section_data =& $sections_helper->getSectionData($section_name);
@@ -62,7 +62,7 @@
$section_name = $this->Application->getUnitOption($section_data['perm_prefix'].'.main', 'PermSection');
}
- $permissions_helper =& $this->Application->recallObject('PermissionsHelper');
+ $permissions_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $permissions_helper kPermissionsHelper */
if (!$permissions_helper->isOldPermission($section_name, $perm_name)) {
@@ -74,7 +74,7 @@
function LoadPermissions($params)
{
- $permissions_helper =& $this->Application->recallObject('PermissionsHelper');
+ $permissions_helper = $this->Application->recallObject('PermissionsHelper');
$prefix_parts = explode('-', $this->Prefix, 2);
/* @var $permissions_helper kPermissionsHelper */
@@ -88,7 +88,7 @@
function PrintPermissions($params)
{
- $category =& $this->Application->recallObject('c');
+ $category = $this->Application->recallObject('c');
/* @var $category kDBItem */
$group_id = $this->Application->GetVar('group_id');
@@ -204,7 +204,7 @@
$id_field = $this->Application->getUnitOption('c', 'IDField');
$table_name = $this->Application->getUnitOption('c', 'TableName');
- $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+ $ml_formatter = $this->Application->recallObject('kMultiLanguage');
/* @var $ml_formatter kMultiLanguage */
$sql = 'SELECT ' . $ml_formatter->LangFieldName('CachedNavbar') . '
Index: units/priorites/priority_eh.php
===================================================================
--- units/priorites/priority_eh.php (revision 15130)
+++ units/priorites/priority_eh.php (working copy)
@@ -165,7 +165,7 @@
return ;
}
- $priority_helper =& $this->Application->recallObject('PriorityHelper');
+ $priority_helper = $this->Application->recallObject('PriorityHelper');
/* @var $priority_helper kPriorityHelper */
list ($constrain, $joins) = $this->getConstrainInfo($event);
@@ -241,7 +241,7 @@
$del = $this->Application->RecallVar('priority_deleted'.$this->Application->GetVar('m_wid'));
$del = $del ? unserialize($del) : array();
- $priority_helper =& $this->Application->recallObject('PriorityHelper');
+ $priority_helper = $this->Application->recallObject('PriorityHelper');
/* @var $priority_helper kPriorityHelper */
foreach ($del as $del_info) {
@@ -266,7 +266,7 @@
$tmp = $this->Application->RecallVar('priority_changes'.$this->Application->GetVar('m_wid'));
$changes = $tmp ? unserialize($tmp) : array();
- $priority_helper =& $this->Application->recallObject('PriorityHelper');
+ $priority_helper = $this->Application->recallObject('PriorityHelper');
/* @var $priority_helper kPriorityHelper */
list ($constrain, $joins) = $this->getConstrainInfo($event);
@@ -281,7 +281,7 @@
{
$obj =& $event->MasterEvent->getObject();
if ($obj->GetDBField('Priority') == 0) {
- $priority_helper =& $this->Application->recallObject('PriorityHelper');
+ $priority_helper = $this->Application->recallObject('PriorityHelper');
/* @var $priority_helper kPriorityHelper */
list ($constrain, $joins) = $this->getConstrainInfo($event);
@@ -314,7 +314,7 @@
WHERE '.$id_field.' IN ('.implode(',', $ids).') ORDER BY Priority DESC';
$priorities = $this->Conn->GetCol($sql, $id_field);
- $priority_helper =& $this->Application->recallObject('PriorityHelper');
+ $priority_helper = $this->Application->recallObject('PriorityHelper');
/* @var $priority_helper kPriorityHelper */
list ($constrain, $joins) = $this->getConstrainInfo($event);
@@ -366,7 +366,7 @@
*/
function OnRecalculatePriorities($event)
{
- $priority_helper =& $this->Application->recallObject('PriorityHelper');
+ $priority_helper = $this->Application->recallObject('PriorityHelper');
/* @var $priority_helper kPriorityHelper */
$prefix = $this->Application->GetVar('priority_prefix');
Index: units/promo_blocks/promo_block_eh.php
===================================================================
--- units/promo_blocks/promo_block_eh.php (revision 15130)
+++ units/promo_blocks/promo_block_eh.php (working copy)
@@ -71,7 +71,7 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $promo_block_group =& $this->Application->recallObject('promo-block-group');
+ $promo_block_group = $this->Application->recallObject('promo-block-group');
/* @var $promo_block_group kDBItem */
$object->SetDBField('PromoBlockGroupId', $promo_block_group->GetID());
@@ -104,7 +104,7 @@
/* @var $object kDBList */
if ( $this->Application->isAdmin ) {
- $promo_block_group =& $this->Application->recallObject('promo-block-group');
+ $promo_block_group = $this->Application->recallObject('promo-block-group');
/* @var $promo_block_group kDBItem */
$object->addFilter('promo_group_filter', '%1$s.PromoBlockGroupId = ' . $promo_block_group->GetID());
@@ -114,7 +114,7 @@
$group_id = $event->getEventParam('group_id');
if ( !$group_id ) {
- $page =& $this->Application->recallObject('st');
+ $page = $this->Application->recallObject('st');
/* @var $page CategoriesItem */
$group_id = $page->GetDBField('PromoBlockGroupId');
@@ -319,7 +319,7 @@
{
parent::OnAfterConfigRead($event);
- $category_helper =& $this->Application->recallObject('CategoryHelper');
+ $category_helper = $this->Application->recallObject('CategoryHelper');
/* @var $category_helper CategoryHelper */
$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
Index: units/promo_blocks/promo_block_tp.php
===================================================================
--- units/promo_blocks/promo_block_tp.php (revision 15111)
+++ units/promo_blocks/promo_block_tp.php (working copy)
@@ -72,7 +72,7 @@
$group_id = $params['group_id'];
}
else {
- $page =& $this->Application->recallObject('st');
+ $page = $this->Application->recallObject('st');
/* @var $page CategoriesItem */
$group_id = $page->GetDBField('PromoBlockGroupId');
Index: units/reviews/reviews_event_handler.php
===================================================================
--- units/reviews/reviews_event_handler.php (revision 15130)
+++ units/reviews/reviews_event_handler.php (working copy)
@@ -43,11 +43,11 @@
public function CheckPermission(kEvent $event)
{
if ( $event->Name == 'OnAddReview' || $event->Name == 'OnCreate' ) {
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
- $main_object =& $this->Application->recallObject($parent_prefix);
+ $main_object = $this->Application->recallObject($parent_prefix);
/* @var $main_object kCatDBItem */
$perm_name = $this->getPermPrefix($event).'.REVIEW';
@@ -70,7 +70,7 @@
if ( in_array($event->Name, $check_events) ) {
// check for PRODUCT.VIEW permission
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
$perm_prefix = $this->getPermPrefix($event);
@@ -195,7 +195,7 @@
$object->clearFilters();
$parent_info = $object->getLinkedInfo();
- $parent =& $this->Application->recallObject($parent_info['ParentPrefix']);
+ $parent = $this->Application->recallObject($parent_info['ParentPrefix']);
/* @var $parent kDBItem */
$object->addFilter('item_reviews', '%1$s.ItemId = ' . $parent->GetDBField('ResourceId'));
@@ -243,7 +243,7 @@
function getReviewStatus($event)
{
$parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
- $main_object =& $this->Application->recallObject($parent_prefix);
+ $main_object = $this->Application->recallObject($parent_prefix);
/* @var $main_object kCatDBItem */
$ret = STATUS_DISABLED;
@@ -284,7 +284,7 @@
return ;
}
- $spam_helper =& $this->Application->recallObject('SpamHelper');
+ $spam_helper = $this->Application->recallObject('SpamHelper');
/* @var $spam_helper SpamHelper */
$spam_helper->InitHelper($parent_info['ParentId'], 'Review', 0);
@@ -342,7 +342,7 @@
$this->updateSubitemCounters($event);
if ( !$this->Application->isAdminUser ) {
- $spam_helper =& $this->Application->recallObject('SpamHelper');
+ $spam_helper = $this->Application->recallObject('SpamHelper');
/* @var $spam_helper SpamHelper */
$object =& $event->getObject();
@@ -411,7 +411,7 @@
$parent_table_key = $this->Application->getUnitOption($event->Prefix, 'ParentTableKey');
$foreign_key = $this->Application->getUnitOption($event->Prefix, 'ForeignKey');
- $main_object =& $this->Application->recallObject($parent_prefix, null, Array ('skip_autoload' => true));
+ $main_object = $this->Application->recallObject($parent_prefix, null, Array ('skip_autoload' => true));
/* @var $main_object kDBItem */
$main_object->Load($object->GetDBField($foreign_key), $parent_table_key);
@@ -541,7 +541,7 @@
/* @var $object kDBItem */
if ( $this->Application->GetVar('ajax') == 'yes' ) {
- $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper');
+ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
/* @var $ajax_form_helper AjaxFormHelper */
$params = Array ('status' => 'OK');
Index: units/reviews/reviews_tag_processor.php
===================================================================
--- units/reviews/reviews_tag_processor.php (revision 15111)
+++ units/reviews/reviews_tag_processor.php (working copy)
@@ -70,7 +70,7 @@
$parent_prefix = $this->Application->getUnitOption($this->Prefix, 'ParentPrefix');
- $main_object =& $this->Application->recallObject($parent_prefix);
+ $main_object = $this->Application->recallObject($parent_prefix);
/* @var $main_object kCatDBItem */
if ( !isset($cache) ) {
@@ -137,10 +137,10 @@
function AlreadyReviewed($params)
{
$parent_prefix = $this->Application->getUnitOption($this->Prefix, 'ParentPrefix');
- $main_object =& $this->Application->recallObject($parent_prefix);
+ $main_object = $this->Application->recallObject($parent_prefix);
/* @var $main_object kCatDBItem */
- $spam_helper =& $this->Application->recallObject('SpamHelper');
+ $spam_helper = $this->Application->recallObject('SpamHelper');
/* @var $spam_helper SpamHelper */
$spam_helper->InitHelper($main_object->GetDBField('ResourceId'), 'Review', 0, $main_object->GetCol('ResourceId'));
@@ -227,7 +227,7 @@
$object =& $this->getObject($params);
/* @var $object kDBItem */
- $rating_helper =& $this->Application->recallObject('RatingHelper');
+ $rating_helper = $this->Application->recallObject('RatingHelper');
/* @var $rating_helper RatingHelper */
$rating = isset($params['rating']) ? $params['rating'] : $object->GetDBField('Rating');
Index: units/scheduled_tasks/scheduled_task_eh.php
===================================================================
--- units/scheduled_tasks/scheduled_task_eh.php (revision 15130)
+++ units/scheduled_tasks/scheduled_task_eh.php (working copy)
@@ -78,7 +78,7 @@
$delete_ids = $this->Conn->GetCol($sql);
if ($delete_ids) {
- $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems($event->Prefix, $event->Special, $delete_ids);
Index: units/sections/site_config_eh.php
===================================================================
--- units/sections/site_config_eh.php (revision 15130)
+++ units/sections/site_config_eh.php (working copy)
@@ -35,7 +35,7 @@
}
if (!isset($this->_helper)) {
- $this->_helper =& $this->Application->recallObject('SiteConfigHelper');
+ $this->_helper = $this->Application->recallObject('SiteConfigHelper');
}
$prefix_file = basename( $this->Application->UnitConfigReader->getPrefixFile($event->MasterEvent->Prefix) );
Index: units/sections/site_config_tp.php
===================================================================
--- units/sections/site_config_tp.php (revision 15111)
+++ units/sections/site_config_tp.php (working copy)
@@ -24,7 +24,7 @@
EDITING_MODE_DESIGN => Array ('image' => 'design_mode', 'title' => 'la_btn_DesignMode'),
);
- $site_config_helper =& $this->Application->recallObject('SiteConfigHelper');
+ $site_config_helper = $this->Application->recallObject('SiteConfigHelper');
/* @var $site_config_helper SiteConfigHelper */
$settings = $site_config_helper->getSettings();
Index: units/site_domains/site_domain_eh.php
===================================================================
--- units/site_domains/site_domain_eh.php (revision 15130)
+++ units/site_domains/site_domain_eh.php (working copy)
@@ -61,7 +61,7 @@
function querySiteDomain($field, $value)
{
- $site_helper =& $this->Application->recallObject('SiteHelper');
+ $site_helper = $this->Application->recallObject('SiteHelper');
/* @var $site_helper SiteHelper */
$site_domains = $site_helper->getSiteDomains();
@@ -127,14 +127,14 @@
return;
}
- $site_helper =& $this->Application->recallObject('SiteHelper');
+ $site_helper = $this->Application->recallObject('SiteHelper');
/* @var $site_helper SiteHelper */
$site_domains = $site_helper->getSiteDomains();
$domain_data = array_key_exists($id, $site_domains) ? $site_domains[$id] : false;
if ( $object->LoadFromHash($domain_data) ) {
- $actions =& $this->Application->recallObject('kActions');
+ $actions = $this->Application->recallObject('kActions');
/* @var $actions Params */
$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
Index: units/skins/skin_eh.php
===================================================================
--- units/skins/skin_eh.php (revision 15130)
+++ units/skins/skin_eh.php (working copy)
@@ -119,7 +119,7 @@
/* @var $object kDBItem */
if ( !$object->IsTempTable() ) {
- $skin_helper =& $this->Application->recallObject('SkinHelper');
+ $skin_helper = $this->Application->recallObject('SkinHelper');
/* @var $skin_helper SkinHelper */
$skin_helper->compile($object);
@@ -149,7 +149,7 @@
return ;
}
- $skin_helper =& $this->Application->recallObject('SkinHelper');
+ $skin_helper = $this->Application->recallObject('SkinHelper');
/* @var $skin_helper SkinHelper */
foreach ($ids as $id) {
Index: units/spam_reports/spam_report_eh.php
===================================================================
--- units/spam_reports/spam_report_eh.php (revision 15130)
+++ units/spam_reports/spam_report_eh.php (working copy)
@@ -43,7 +43,7 @@
// function CheckPermission($event)
// {
// if ( $event->Name == 'OnNewReport' ) {
-// $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+// $perm_helper = $this->Application->recallObject('PermissionsHelper');
// /* @var $perm_helper kPermissionsHelper */
//
// return $perm_helper->finalizePermissionCheck($event, $this->Application->LoggedIn());
@@ -94,7 +94,7 @@
$item_prefix = $object->GetDBField('ItemPrefix');
if ( preg_match('/rev$/', $item_prefix) ) {
- $item =& $this->Application->recallObject($item_prefix);
+ $item = $this->Application->recallObject($item_prefix);
/* @var $item kDBItem */
$object->SetDBField('ItemName', $item->GetDBField('ReviewText'));
@@ -110,7 +110,7 @@
*/
function OnNewReport($event)
{
- $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper');
+ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
/* @var $ajax_form_helper AjaxFormHelper */
$ajax_form_helper->transitEvent($event, 'OnCreate');
@@ -134,7 +134,7 @@
$item_prefix = $object->GetDBField('ItemPrefix');
if ( !isset($temp_handlers[$item_prefix]) ) {
- $temp_handlers[$item_prefix] =& $this->Application->recallObject($item_prefix . '_TempHandler', 'kTempTablesHandler');
+ $temp_handlers[$item_prefix] = $this->Application->recallObject($item_prefix . '_TempHandler', 'kTempTablesHandler');
}
$temp_handlers[$item_prefix]->DeleteItems($item_prefix, '', Array ($object->GetDBField('ItemId')));
Index: units/statistics/statistics_tag_processor.php
===================================================================
--- units/statistics/statistics_tag_processor.php (revision 15111)
+++ units/statistics/statistics_tag_processor.php (working copy)
@@ -44,7 +44,7 @@
switch ($this->PostFormatting) {
case 'number':
// simple-specific postformatting
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
$value = $lang->formatNumber($value, $this->PostFormattingParams['precision']);
@@ -122,7 +122,7 @@
case 'm:post_format':
// m:post_format field="" type="" precision="2"
- $lang =& $this->Application->recallObject('lang.current');
+ $lang = $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
switch ($tag_params['type']) {
@@ -255,7 +255,7 @@
*/
function getPendingPrefixes()
{
- $modules_helper =& $this->Application->recallObject('ModulesHelper');
+ $modules_helper = $this->Application->recallObject('ModulesHelper');
/* @var $modules_helper kModulesHelper */
$licensed_modules = array_map('strtolower', $modules_helper->_GetModules());
Index: units/stylesheets/stylesheets_item.php
===================================================================
--- units/stylesheets/stylesheets_item.php (revision 15111)
+++ units/stylesheets/stylesheets_item.php (working copy)
@@ -19,9 +19,9 @@
function Compile()
{
- $selector_item =& $this->Application->recallObject('selectors.item', 'selectors', Array('live_table'=>true, 'skip_autoload' => true) );
+ $selector_item = $this->Application->recallObject('selectors.item', 'selectors', Array('live_table'=>true, 'skip_autoload' => true) );
/* @var $selector_item SelectorsItem */
-
+
$parent_field = $this->Application->getUnitOption($selector_item->Prefix, 'ForeignKey');
$sql_template = 'SELECT '.$selector_item->IDField.' FROM '.$selector_item->TableName.' WHERE '.$parent_field.' = %s ORDER BY SelectorName ASC';
@@ -40,7 +40,7 @@
$compile_ts = adodb_mktime();
$css_path = WRITEABLE . '/stylesheets/';
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$file_helper->CheckFolder($css_path);
Index: units/theme_files/theme_file_eh.php
===================================================================
--- units/theme_files/theme_file_eh.php (revision 15130)
+++ units/theme_files/theme_file_eh.php (working copy)
@@ -119,7 +119,7 @@
fwrite($fp, $object->GetDBField('FileContents'));
fclose($fp);
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
$meta_info = $themes_helper->parseTemplateMetaInfo($filename);
@@ -139,7 +139,7 @@
*/
function _getTemplatePath(&$object)
{
- $theme =& $this->Application->recallObject('theme');
+ $theme = $this->Application->recallObject('theme');
/* @var $theme kDBItem */
$path = FULL_PATH . '/themes/' . $theme->GetDBField('Name');
@@ -161,7 +161,7 @@
$object =& $event->getObject();
/* @var $object kDBItem */
- $template_helper =& $this->Application->recallObject('TemplateHelper');
+ $template_helper = $this->Application->recallObject('TemplateHelper');
/* @var $template_helper TemplateHelper */
$template_helper->InitHelper($object);
@@ -191,7 +191,7 @@
$status = $object->Validate();
- $template_helper =& $this->Application->recallObject('TemplateHelper');
+ $template_helper = $this->Application->recallObject('TemplateHelper');
/* @var $template_helper TemplateHelper */
$template_helper->InitHelper($object);
@@ -220,7 +220,7 @@
$target_order = $this->Application->GetVar('target_order');
- $template_helper =& $this->Application->recallObject('TemplateHelper');
+ $template_helper = $this->Application->recallObject('TemplateHelper');
/* @var $template_helper TemplateHelper */
if ($template_helper->moveTemplateElements($target_order)) {
Index: units/themes/themes_eh.php
===================================================================
--- units/themes/themes_eh.php (revision 15130)
+++ units/themes/themes_eh.php (working copy)
@@ -102,7 +102,7 @@
{
parent::OnAfterCopyToLive($event);
- $object =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true, 'live_table' => true));
+ $object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true, 'live_table' => true));
/* @var $object kDBItem */
$object->Load($event->getEventParam('id'));
@@ -184,7 +184,7 @@
// site domain theme picker
if ( $event->Special == 'selected' || $event->Special == 'available' ) {
- $edit_picker_helper =& $this->Application->recallObject('EditPickerHelper');
+ $edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
/* @var $edit_picker_helper EditPickerHelper */
$edit_picker_helper->applyFilter($event, 'Themes');
Index: units/themes/themes_tag_processor.php
===================================================================
--- units/themes/themes_tag_processor.php (revision 15111)
+++ units/themes/themes_tag_processor.php (working copy)
@@ -28,7 +28,7 @@
{
$object =& $this->getObject($params);
- $themes_helper =& $this->Application->recallObject('ThemesHelper');
+ $themes_helper = $this->Application->recallObject('ThemesHelper');
/* @var $themes_helper kThemesHelper */
return $object->GetDBField('ThemeId') == $themes_helper->getCurrentThemeId();
Index: units/translator/translator_event_handler.php
===================================================================
--- units/translator/translator_event_handler.php (revision 15130)
+++ units/translator/translator_event_handler.php (working copy)
@@ -82,7 +82,7 @@
{
list($obj_prefix, $field) = $this->getPrefixAndField($event);
- $object =& $this->Application->recallObject($obj_prefix);
+ $object = $this->Application->recallObject($obj_prefix);
/* @var $object kDBItem */
$translator =& $event->getObject();
@@ -105,7 +105,7 @@
$translator->SetDBField('Translation', $object->GetDBField('l'.$current_lang.'_'.$field));
- $cur_lang =& $this->Application->recallObject('lang.current');
+ $cur_lang = $this->Application->recallObject('lang.current');
/* @var $cur_lang LanguagesItem */
$cur_lang->Load($current_lang);
@@ -147,7 +147,7 @@
list($obj_prefix, $field) = $this->getPrefixAndField($event);
- $object =& $this->Application->recallObject($obj_prefix);
+ $object = $this->Application->recallObject($obj_prefix);
/* @var $object kDBItem */
$lang = $translator->GetDBField('Language');
Index: units/user_groups/user_groups_eh.php
===================================================================
--- units/user_groups/user_groups_eh.php (revision 15130)
+++ units/user_groups/user_groups_eh.php (working copy)
@@ -97,7 +97,7 @@
$ids = $this->StoreSelectedIDs($event);
if ($ids) {
- $user =& $this->Application->recallObject('u');
+ $user = $this->Application->recallObject('u');
/* @var $user kDBItem */
$user->SetDBField('PrimaryGroupId', array_shift($ids));
Index: units/user_profile/user_profile_eh.php
===================================================================
--- units/user_profile/user_profile_eh.php (revision 15130)
+++ units/user_profile/user_profile_eh.php (working copy)
@@ -72,7 +72,7 @@
}
if ($public_profile_add || $public_profile_remove) {
- $user =& $this->Application->recallObject('u.current');
+ $user = $this->Application->recallObject('u.current');
/* @var $user kDBItem */
// get current value
Index: units/user_profile/user_profile_tp.php
===================================================================
--- units/user_profile/user_profile_tp.php (revision 15111)
+++ units/user_profile/user_profile_tp.php (working copy)
@@ -66,7 +66,7 @@
static $cache = null;
if (!isset($cache)) {
- $user =& $this->Application->recallObject( $this->getUserPrefixSpecial() );
+ $user = $this->Application->recallObject( $this->getUserPrefixSpecial() );
/* @var $user kDBItem */
$sql = 'SELECT VariableValue, VariableName
@@ -104,7 +104,7 @@
static $field_count = null;
if (!isset($field_count)) {
- $user =& $this->Application->recallObject( $this->getUserPrefixSpecial() );
+ $user = $this->Application->recallObject( $this->getUserPrefixSpecial() );
/* @var $user kDBItem */
$display_to_public = $user->GetDBField('DisplayToPublic');
Index: units/users/users_event_handler.php
===================================================================
--- units/users/users_event_handler.php (revision 15130)
+++ units/users/users_event_handler.php (working copy)
@@ -160,7 +160,7 @@
}
if ( $event->Name == 'OnLoginAs' ) {
- $admin_session =& $this->Application->recallObject('Session.admin');
+ $admin_session = $this->Application->recallObject('Session.admin');
/* @var $admin_session Session */
return $admin_session->LoggedIn();
@@ -176,7 +176,7 @@
}
if ( $event->Name == 'OnUpdate' && $user_id > 0 ) {
- $user_dummy =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+ $user_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
/* @var $user_dummy UsersItem */
foreach ($items_info as $id => $field_values) {
@@ -240,7 +240,7 @@
if ($this->Application->GetVar('admin') == 1) {
// Front-End showed in admin's right frame
- $session_admin =& $this->Application->recallObject('Session.admin');
+ $session_admin = $this->Application->recallObject('Session.admin');
/* @var $session_admin Session */
if (!$session_admin->LoggedIn()) {
@@ -289,7 +289,7 @@
$password = $object->GetDBField('UserPassword');
$remember_login = $object->GetDBField('UserRememberLogin') == 1;
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$user_helper->event =& $event;
@@ -316,7 +316,7 @@
*/
protected function OnLoginAjax($event)
{
- $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper');
+ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
/* @var $ajax_form_helper AjaxFormHelper */
$ajax_form_helper->transitEvent($event, 'OnLogin'); //, Array ('do_refresh' => 1));
@@ -335,7 +335,7 @@
return ;
}
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$user_helper->loginUser('', '', false, false, $remember_login_cookie);
@@ -348,7 +348,7 @@
*/
function OnInpLogin($event)
{
- $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
+ $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
/* @var $sync_manager UsersSyncronizeManager */
$sync_manager->performAction('LoginUser', $event->getEventParam('user'), $event->getEventParam('pass') );
@@ -366,7 +366,7 @@
*/
function OnInpLogout($event)
{
- $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
+ $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
/* @var $sync_manager UsersSyncronizeManager */
$sync_manager->performAction('LogoutUser');
@@ -381,7 +381,7 @@
*/
protected function OnLogout($event)
{
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$user_helper->event =& $event;
@@ -462,7 +462,7 @@
*/
protected function OnRegisterAjax(kEvent $event)
{
- $ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper');
+ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
/* @var $ajax_form_helper AjaxFormHelper */
$ajax_form_helper->transitEvent($event, 'OnCreate', Array ('do_refresh' => 1));
@@ -477,7 +477,7 @@
*/
protected function getSubscriberByEmail($email)
{
- $verify_user =& $this->Application->recallObject('u.verify', null, Array ('skip_autoload' => true));
+ $verify_user = $this->Application->recallObject('u.verify', null, Array ('skip_autoload' => true));
/* @var $verify_user UsersItem */
$verify_user->Load($email, 'Email');
@@ -496,7 +496,7 @@
/* @var $object UsersItem */
if ( $object->GetDBField('Status') == STATUS_ACTIVE ) {
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$user =& $user_helper->getUserObject();
@@ -521,7 +521,7 @@
$this->beforeItemChanged($event);
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$object =& $event->getObject();
@@ -540,7 +540,7 @@
$this->setUserGroup($object);
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
if ( !$user_helper->checkBanRules($object) ) {
@@ -695,7 +695,7 @@
$object->Validate();
}
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->PopulateStates($event, 'State', 'Country');
@@ -766,7 +766,7 @@
}
if ( $object->isSubscriberOnly() ) {
- $temp_handler =& $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$temp_handler->DeleteItems($event->Prefix, '', Array($object->GetID()));
@@ -850,7 +850,7 @@
$field_values = $this->getSubmittedFields($event);
$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
- $user_object =& $this->Application->recallObject('u.tmp', null, Array('skip_autoload' => true));
+ $user_object = $this->Application->recallObject('u.tmp', null, Array('skip_autoload' => true));
/* @var $user_object UsersItem */
$found = $allow_reset = false;
@@ -933,7 +933,7 @@
$this->beforeItemChanged($event);
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->CheckStateField($event, 'State', 'Country');
@@ -980,7 +980,7 @@
}
if ( $this->Application->ConfigValue('RegistrationCaptcha') ) {
- $captcha_helper =& $this->Application->recallObject('CaptchaHelper');
+ $captcha_helper = $this->Application->recallObject('CaptchaHelper');
/* @var $captcha_helper kCaptchaHelper */
$captcha_helper->validateCode($event, false);
@@ -1128,7 +1128,7 @@
{
switch ($event->Special) {
case 'ord':
- $order =& $this->Application->recallObject('ord');
+ $order = $this->Application->recallObject('ord');
/* @var $order OrdersItem */
return $order->GetDBField('PortalUserId');
@@ -1146,7 +1146,7 @@
break;
case 'forgot':
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$id = $user_helper->validateUserCode($this->Application->GetVar('user_key'), 'forgot_password');
@@ -1193,7 +1193,7 @@
$user_id = $this->Application->RecallVar('user_id');
if ( $id == $user_id && ($user_id > 0 || $user_id == USER_ROOT) ) {
- $user_dummy =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
+ $user_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
/* @var $user_dummy kDBItem */
$user_dummy->Load($id);
@@ -1544,7 +1544,7 @@
$form_fields =& $forms['default']['Fields'];
// 1. arrange user registration countries
- $site_helper =& $this->Application->recallObject('SiteHelper');
+ $site_helper = $this->Application->recallObject('SiteHelper');
/* @var $site_helper SiteHelper */
$first_country = $site_helper->getDefaultCountry('', false);
@@ -1566,7 +1566,7 @@
$form_fields['PrimaryGroupId']['default'] = $this->Application->ConfigValue('User_NewGroup');
// 3. allow avatar upload on Front-End
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper = $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
$file_helper->createItemFiles($event->Prefix, true); // create image fields
@@ -1614,7 +1614,7 @@
return;
}
- $temp_handler =& $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler');
+ $temp_handler = $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler');
/* @var $temp_handler kTempTablesHandler */
$ids = $this->StoreSelectedIDs($event);
@@ -1717,7 +1717,7 @@
parent::OnAfterItemLoad($event);
// linking existing images for item with virtual fields
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
$object =& $event->getObject();
@@ -1725,7 +1725,7 @@
$image_helper->LoadItemImages($object);
- $cs_helper =& $this->Application->recallObject('CountryStatesHelper');
+ $cs_helper = $this->Application->recallObject('CountryStatesHelper');
/* @var $cs_helper kCountryStatesHelper */
$cs_helper->PopulateStates($event, 'State', 'Country');
@@ -1757,7 +1757,7 @@
function saveUserImages($event)
{
if (!$this->Application->isAdmin) {
- $image_helper =& $this->Application->recallObject('ImageHelper');
+ $image_helper = $this->Application->recallObject('ImageHelper');
/* @var $image_helper ImageHelper */
$object =& $event->getObject();
@@ -1888,7 +1888,7 @@
$event->CallSubEvent('OnUpdate');
if ( $event->status == kEvent::erSUCCESS ) {
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$user =& $user_helper->getUserObject();
@@ -1909,7 +1909,7 @@
*/
protected function OnResetRootPassword($event)
{
- $password_formatter =& $this->Application->recallObject('kPasswordFormatter');
+ $password_formatter = $this->Application->recallObject('kPasswordFormatter');
/* @var $password_formatter kPasswordFormatter */
$new_root_password = kUtil::generatePassword();
@@ -1931,7 +1931,7 @@
*/
protected function OnLoginAs(kEvent $event)
{
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$user =& $user_helper->getUserObject();
Index: units/users/users_item.php
===================================================================
--- units/users/users_item.php (revision 15111)
+++ units/users/users_item.php (working copy)
@@ -35,7 +35,7 @@
ORDER BY IF(GroupId = ' . $this->GetDBField('PrimaryGroupId') . ', 1, 0) DESC';
$groups = $this->Conn->GetCol($sql);
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$user_groups = Array ();
@@ -108,7 +108,7 @@
$ret = parent::Create($force_id, $system_create);
if ( $ret ) {
// find out how to synchronize user only when it's copied to live table
- $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
+ $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
/* @var $sync_manager UsersSyncronizeManager */
$sync_manager->performAction('createUser', $this->FieldValues);
@@ -131,7 +131,7 @@
if ( $ret ) {
// find out how to synchronize user only when it's copied to live table
- $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
+ $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
/* @var $sync_manager UsersSyncronizeManager */
$sync_manager->performAction('updateUser', $this->FieldValues);
@@ -152,7 +152,7 @@
$ret = parent::Delete($id);
if ( $ret ) {
- $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
+ $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
/* @var $sync_manager UsersSyncronizeManager */
$sync_manager->performAction('deleteUser', $this->FieldValues);
Index: units/users/users_syncronize.php
===================================================================
--- units/users/users_syncronize.php (revision 15111)
+++ units/users/users_syncronize.php (working copy)
@@ -68,7 +68,7 @@
foreach ($this->syncClasses as $class_name => $class_info) {
if ($class_name == $this->skipClass) continue;
$this->Application->registerClass($class_name, $class_info['file']);
- $sync_object =& $this->Application->recallObject($class_name, null, Array(), Array ($class_info['sub_folder'], $class_name));
+ $sync_object = $this->Application->recallObject($class_name, null, Array(), Array ($class_info['sub_folder'], $class_name));
call_user_func_array( Array(&$sync_object, $action), $args);
}
}
Index: units/users/users_tag_processor.php
===================================================================
--- units/users/users_tag_processor.php (revision 15111)
+++ units/users/users_tag_processor.php (working copy)
@@ -35,7 +35,7 @@
function ConfirmPasswordLink($params)
{
- $user =& $this->Application->recallObject($this->Prefix . '.email-to');
+ $user = $this->Application->recallObject($this->Prefix . '.email-to');
/* @var $user UsersItem */
$code = $this->getCachedCode();
@@ -93,7 +93,7 @@
function TestCodeIsValid($params)
{
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$code_type = isset($params['code_type']) ? $params['code_type'] : 'forgot_password';
@@ -122,7 +122,7 @@
*/
protected function RestoreEmail($params)
{
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
$hash = $this->Application->GetVar('hash');
@@ -230,7 +230,7 @@
*/
function HasPermission($params)
{
- $perm_helper =& $this->Application->recallObject('PermissionsHelper');
+ $perm_helper = $this->Application->recallObject('PermissionsHelper');
/* @var $perm_helper kPermissionsHelper */
return $perm_helper->TagPermissionCheck($params);
@@ -351,10 +351,10 @@
*/
protected function _updateAndLogin($fields_hash)
{
- $user_helper =& $this->Application->recallObject('UserHelper');
+ $user_helper = $this->Application->recallObject('UserHelper');
/* @var $user_helper UserHelper */
- $user =& $this->Application->recallObject($this->Prefix . '.activate', null, Array ('skip_autoload' => true));
+ $user = $this->Application->recallObject($this->Prefix . '.activate', null, Array ('skip_autoload' => true));
/* @var $user UsersItem */