Index: branches/5.2.x/core/kernel/managers/request_manager.php
===================================================================
diff -u -N -r16339 -r16513
--- branches/5.2.x/core/kernel/managers/request_manager.php	(.../request_manager.php)	(revision 16339)
+++ branches/5.2.x/core/kernel/managers/request_manager.php	(.../request_manager.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: request_manager.php 16339 2016-04-02 13:45:52Z alex $
+* @version	$Id: request_manager.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -153,8 +153,8 @@
 		$event->SetRedirectParam('opener', 's'); // stay on same page after event is called
 		$event->setEventParam('top_prefix', $this->Application->GetTopmostPrefix($event->Prefix, true));
 
+		/** @var kEventHandler $event_handler */
 		$event_handler = $this->Application->recallObject($event->Prefix . '_EventHandler');
-		/* @var $event_handler kEventHandler */
 
 		if ( ($this->Application->RecallVar('user_id') == USER_ROOT) || $event_handler->CheckPermission($event) ) {
 			$this->Application->HandleEvent($event);
@@ -176,8 +176,8 @@
 		$event->redirect = $this->Application->isAdmin ? 'no_permission' : $this->Application->ConfigValue('NoPermissionTemplate');
 		$event->SetRedirectParam('pass', 'm');
 
+		/** @var kThemesHelper $themes_helper */
 		$themes_helper = $this->Application->recallObject('ThemesHelper');
-		/* @var $themes_helper kThemesHelper */
 
 		$event->SetRedirectParam( 'm_cat_id', $themes_helper->getPageByTemplate($event->redirect) );
 
@@ -320,8 +320,8 @@
 	 */
 	protected function processOpener()
 	{
+		/** @var kOpenerStack $opener_stack */
 		$opener_stack = $this->Application->makeClass('kOpenerStack');
-		/* @var $opener_stack kOpenerStack */
 
 		switch ( $this->Application->GetVar('m_opener') ) {
 			case 'r':
@@ -331,8 +331,8 @@
 			case 'd':
 				// "down/push" new template to opener stack, deeplevel++
 				if ( $this->Application->GetVar('front') ) {
+					/** @var Session $front_session */
 					$front_session = $this->Application->recallObject('Session.front');
-					/* @var $front_session Session */
 
 					$opener_stack->pushRaw( '../' . $front_session->RecallVar('last_template') );
 				}
@@ -353,8 +353,8 @@
 				$this->Application->StoreVar('last_wid', $popup_wid);
 				$this->Application->SetVar('m_wid', $popup_wid);
 
+				/** @var kOpenerStack $popup_opener_stack */
 				$popup_opener_stack = $this->Application->makeClass('kOpenerStack', Array ($popup_wid));
-				/* @var $popup_opener_stack kOpenerStack */
 
 				$popup_opener_stack->pushRaw( $this->getLastTemplate($parent_wid) );
 				$popup_opener_stack->save();
@@ -388,16 +388,16 @@
 	protected function getLastTemplate($window_id)
 	{
 		if ( $this->Application->GetVar('front') ) {
+			/** @var Session $front_session */
 			$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
+			/** @var kOpenerStack $parent_opener_stack */
 			$parent_opener_stack = $this->Application->makeClass('kOpenerStack', Array ($window_id));
-			/* @var $parent_opener_stack kOpenerStack */
 
 			$last_template = $parent_opener_stack->pop(true);
 			$parent_opener_stack->save(true);
@@ -428,8 +428,8 @@
 		$window_relations = $window_relations ? unserialize($window_relations) : Array ();
 		$wid = isset($window_relations[$wid]) ? $window_relations[$wid] : false;*/
 
+		/** @var kOpenerStack $opener_stack */
 		$opener_stack = $this->Application->makeClass('kOpenerStack', Array ($wid));
-		/* @var $opener_stack kOpenerStack */
 
 		// change opener stack
 		$default_params = Array ('m_opener' => 'u');
@@ -460,8 +460,8 @@
 	 */
 	protected function openerStackChange($new_template = null, $new_params = null)
 	{
+		/** @var kOpenerStack $opener_stack */
 		$opener_stack = $this->Application->makeClass('kOpenerStack');
-		/* @var $opener_stack kOpenerStack */
 
 		list ($template, $params, $index_file) = $opener_stack->pop();