Index: branches/5.2.x/core/kernel/managers/url_manager.php =================================================================== diff -u -N -r15073 -r15137 --- branches/5.2.x/core/kernel/managers/url_manager.php (.../url_manager.php) (revision 15073) +++ branches/5.2.x/core/kernel/managers/url_manager.php (.../url_manager.php) (revision 15137) @@ -1,6 +1,6 @@ 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);