Index: branches/5.2.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r14092 -r14095
--- branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 14092)
+++ branches/5.2.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 14092 2010-11-26 22:43:15Z alex $
+* @version	$Id: categories_tag_processor.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -273,7 +273,7 @@
 		unset($params['cat_id'], $params['module']);
 
 		$new_params = Array ('pass' => 'm', 'm_cat_id' => $category_id, 'pass_category' => 1);
-		$params = array_merge_recursive2($params, $new_params);
+		$params = array_merge($params, $new_params);
 
 		return $this->Application->ProcessParsedTag('m', 't', $params);
 	}
@@ -284,7 +284,7 @@
 		$object =& $this->GetList($params);
 
 
-		if ($object->RecordsCount == 0)
+		if ($object->GetRecordsCount() == 0)
 		{
 			if (isset($params['block_no_cats'])) {
 				$params['name'] = $params['block_no_cats'];
@@ -470,7 +470,7 @@
 
 	function InitCacheUpdater($params)
 	{
-		safeDefine('CACHE_PERM_CHUNK_SIZE', 30);
+		kUtil::safeDefine('CACHE_PERM_CHUNK_SIZE', 30);
 
 		$continue = $this->Application->GetVar('continue');
 		$total_cats = (int) $this->Conn->GetOne('SELECT COUNT(*) FROM '.TABLE_PREFIX.'Category');
@@ -485,8 +485,9 @@
 			$continue = 1;
 		}
 
-		$updater =& $this->Application->recallObject('kPermCacheUpdater', null, Array('continue' => $continue));
+		$updater =& $this->Application->makeClass('kPermCacheUpdater', Array($continue));
 		/* @var $updater kPermCacheUpdater */
+
 		if ($continue === '0') { // No in dialog
 			$updater->clearData();
 			$this->Application->Redirect($params['destination_template']);
@@ -622,11 +623,7 @@
 		$params['skip_quering'] = true;
 		$object =& $this->GetList($params);
 
-		if (!$object->Counted) {
-			$object->CountRecs();
-		}
-
-		return $object->NoFilterCount != $object->RecordsCount ? $object->RecordsCount.' / '.$object->NoFilterCount : $object->RecordsCount;
+		return $object->GetRecordsCount(false) != $object->GetRecordsCount() ? $object->GetRecordsCount().' / '.$object->GetRecordsCount(false) : $object->GetRecordsCount();
 	}
 
 	function InitCatalog($params)
@@ -899,7 +896,7 @@
 	 */
 	function SpellingSuggestions($params)
 	{
-		$keywords = unhtmlentities( trim($this->Application->GetVar('keywords')) );
+		$keywords = kUtil::unhtmlentities( trim($this->Application->GetVar('keywords')) );
 		if (!$keywords) {
 			return ;
 		}