Index: branches/5.2.x/core/units/helpers/mod_rewrite_helper.php
===================================================================
diff -u -N -r16034 -r16513
--- branches/5.2.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 16034)
+++ branches/5.2.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mod_rewrite_helper.php 16034 2014-06-07 15:05:51Z alex $
+* @version	$Id: mod_rewrite_helper.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -36,8 +36,8 @@
 			$module_prefix = $this->_parseCategoryItemUrl($url_parts, $params, $prefix);
 
 			if ($module_prefix !== false) {
+				/** @var kRewriteUrlProcessor $rewrite_processor */
 				$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-				/* @var $rewrite_processor kRewriteUrlProcessor */
 
 				$params['pass'][] = $module_prefix;
 				$rewrite_processor->setModulePrefix($module_prefix);
@@ -59,8 +59,8 @@
 		{
 			static $default_per_page = Array ();
 
+			/** @var kRewriteUrlProcessor $rewrite_processor */
 			$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-			/* @var $rewrite_processor kRewriteUrlProcessor */
 
 			$ret = '';
 			list ($prefix) = explode('.', $prefix_special);
@@ -76,8 +76,8 @@
 			}
 
 			if (!array_key_exists($prefix, $default_per_page)) {
+				/** @var ListHelper $list_helper */
 				$list_helper = $this->Application->recallObject('ListHelper');
-				/* @var $list_helper ListHelper */
 
 				$default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix);
 			}
@@ -145,8 +145,8 @@
 				return true;
 			}
 
+			/** @var kRewriteUrlProcessor $rewrite_processor */
 			$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-			/* @var $rewrite_processor kRewriteUrlProcessor */
 
 			$ret = '';
 			list ($prefix) = explode('.', $prefix_special);
@@ -157,8 +157,8 @@
 			}
 
 			if (!array_key_exists($prefix, $default_per_page)) {
+				/** @var ListHelper $list_helper */
 				$list_helper = $this->Application->recallObject('ListHelper');
-				/* @var $list_helper ListHelper */
 
 				$default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix);
 			}
@@ -252,8 +252,8 @@
 				return false;
 			}
 
+			/** @var kRewriteUrlProcessor $rewrite_processor */
 			$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-			/* @var $rewrite_processor kRewriteUrlProcessor */
 
 			if ( $prefix == 'bb' && preg_match('/^bb_([\d]+)/', $item_filename, $regs) ) {
 				// process topics separately, because they don't use item filenames
@@ -335,8 +335,8 @@
 		 */
 		protected function _parseTopicUrl($topic_id, &$vars)
 		{
+			/** @var kRewriteUrlProcessor $rewrite_processor */
 			$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-			/* @var $rewrite_processor kRewriteUrlProcessor */
 
 			$sql = 'SELECT c.ParentPath, c.CategoryId
 					FROM ' . TABLE_PREFIX . 'Categories AS c