Index: trunk/core/units/general/helpers/permissions_helper.php
===================================================================
diff -u -N -r5218 -r5325
--- trunk/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 5218)
+++ trunk/core/units/general/helpers/permissions_helper.php	(.../permissions_helper.php)	(revision 5325)
@@ -9,15 +9,15 @@
 		 */
 		var $Permissions = Array();
 		
-		function LoadPermissions($prefix)
+		function LoadPermissions($group_id, $cat_id, $type = 1, $temp_mode = false)
 		{
-			$object =& $this->Application->recallObject($prefix.'-perm', null, Array('skip_autoload' => true));
-			
-			$foreign_key = $this->Application->getUnitOption($prefix.'-perm', 'ForeignKey');
-			$foreign_value = $this->Application->GetVar($prefix.'_id');
+			$perm_table = $this->Application->getUnitOption('perm', 'TableName');
+			if ($temp_mode) {
+				$perm_table = $this->Application->GetTempName($perm_table);
+			}
 			$sql = 'SELECT *
-					FROM '.$object->TableName.'
-					WHERE '.$foreign_key.' = '.$foreign_value;
+					FROM '.$perm_table.'
+					WHERE (GroupId = '.$group_id.') AND (CatId = '.$cat_id.') AND (Type = '.$type.')';
 			$permissions = $this->Conn->Query($sql, 'Permission');
 			
 			$this->Permissions = Array();
@@ -30,12 +30,12 @@
 		
 		function getPermissionValue($perm_name)
 		{
-			 return getArrayValue($this->Permissions, $perm_name) ? $this->Permissions[$perm_name]['value'] : 0;
+			 return isset($this->Permissions[$perm_name]) ? $this->Permissions[$perm_name]['value'] : 0;
 		}
 		
 		function getPermissionID($perm_name)
 		{
-			return getArrayValue($this->Permissions, $perm_name) ? $this->Permissions[$perm_name]['id'] : 0;
+			return isset($this->Permissions[$perm_name]) ? $this->Permissions[$perm_name]['id'] : 0;
 		}
 		
 		/**