Index: branches/5.3.x/core/kernel/managers/url_manager.php
===================================================================
diff -u -N -r16395 -r16519
--- branches/5.3.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 16395)
+++ branches/5.3.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: url_manager.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: url_manager.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -132,8 +132,8 @@
 
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : NULL;
 		if ( $ssl !== NULL ) {
+			/** @var Session $session */
 			$session = $this->Application->recallObject('Session');
-			/* @var $session Session */
 
 			$target_url = rtrim($this->Application->BaseURL('', $ssl), '/');
 			$cookie_url = trim($session->CookieDomain . $session->CookiePath, '/.');
@@ -236,8 +236,8 @@
 	 */
 	protected function processPopupClose($prefix = '', $params = Array ())
 	{
+		/** @var kOpenerStack $opener_stack */
 		$opener_stack = $this->Application->makeClass('kOpenerStack');
-		/* @var $opener_stack kOpenerStack */
 
 		if ( $opener_stack->isEmpty() ) {
 			return false;
@@ -449,8 +449,8 @@
 	public function LoadStructureTemplateMapping()
 	{
 		if (!$this->Application->isAdmin) {
+			/** @var CategoryHelper $category_helper */
 			$category_helper = $this->Application->recallObject('CategoryHelper');
-			/* @var $category_helper CategoryHelper */
 
 			$this->structureTemplateMapping = $category_helper->getTemplateMapping();
 		}