Index: branches/5.2.x/core/kernel/managers/request_manager.php =================================================================== diff -u -N -r15130 -r15137 --- branches/5.2.x/core/kernel/managers/request_manager.php (.../request_manager.php) (revision 15130) +++ branches/5.2.x/core/kernel/managers/request_manager.php (.../request_manager.php) (revision 15137) @@ -1,6 +1,6 @@ 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,15 +387,15 @@ 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, '_') ); } 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();