Index: branches/5.2.x/core/units/permissions/permissions_tag_processor.php
===================================================================
diff -u -N -r14628 -r15012
--- branches/5.2.x/core/units/permissions/permissions_tag_processor.php	(.../permissions_tag_processor.php)	(revision 14628)
+++ branches/5.2.x/core/units/permissions/permissions_tag_processor.php	(.../permissions_tag_processor.php)	(revision 15012)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: permissions_tag_processor.php 14628 2011-10-04 09:36:30Z alex $
+* @version	$Id: permissions_tag_processor.php 15012 2012-01-06 20:38:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -64,7 +64,7 @@
 
 			$permissions_helper =& $this->Application->recallObject('PermissionsHelper');
 			/* @var $permissions_helper kPermissionsHelper */
-			
+
 			if (!$permissions_helper->isOldPermission($section_name, $perm_name)) {
 				$perm_name = $section_name.'.'.$perm_name;
 			}
@@ -120,7 +120,7 @@
 
 			$sql = 'SELECT '.$case.', p.Permission AS Perm
 					FROM '.$perm_live_table.' p
-					LEFT JOIN '.TABLE_PREFIX.'PermissionConfig pc ON pc.PermissionName = p.Permission
+					LEFT JOIN '.TABLE_PREFIX.'CategoryPermissionsConfig pc ON pc.PermissionName = p.Permission
 					WHERE
 						p.CatId IN ('.implode(',', $categories).') AND
 						pc.ModuleId = ' . $this->Conn->qstr($module) . ' AND
@@ -146,7 +146,7 @@
 							IF (tmp_p.CatId IS NOT NULL, tmp_p.CatId, IF(p.CatId IS NOT NULL, p.CatId, 0) ) AS InheritedFrom,
 							IF(tmp_p.CatId = '.$category->GetID().', 0, 1) AS Inherited,
 							IF(p.PermissionValue IS NOT NULL, p.PermissionValue, 0) AS InheritedValue
-					FROM '.TABLE_PREFIX.'PermissionConfig pc
+					FROM '.TABLE_PREFIX.'CategoryPermissionsConfig pc
 					LEFT JOIN '.$perm_live_table.' p
 					ON (p.Permission = pc.PermissionName) AND ('.str_replace('#TABLE_PREFIX#', 'p', $pos_sql).') AND (p.GroupId = '.(int)$group_id.')
 					LEFT JOIN '.$perm_temp_table.' tmp_p