Index: trunk/admin/category/permcacheupdate.php
===================================================================
diff -u -r571 -r578
--- trunk/admin/category/permcacheupdate.php	(.../permcacheupdate.php)	(revision 571)
+++ trunk/admin/category/permcacheupdate.php	(.../permcacheupdate.php)	(revision 578)
@@ -26,8 +26,8 @@
 	function Get()
 	{
 		if ($this->Count() > 0) {
-			return end($this->Stack);
-//			return $this->Stack[count($this->Stack)-1];
+//			return end($this->Stack);
+			return $this->Stack[count($this->Stack)-1];
 		}
 		else {
 			return false;
@@ -122,7 +122,7 @@
 			}
 		}
 		if (!$values) return '';
-		$sql = 'INSERT INTO inp_PermCache (CategoryId, PermId, ACL, DACL) VALUES '.join(',', $values);
+		$sql = 'INSERT INTO '.GetTablePrefix().'PermCache (CategoryId, PermId, ACL, DACL) VALUES '.join(',', $values);
 		return $sql;										
 	}
 }
@@ -143,7 +143,7 @@
 
 		if (!$continuing) {
 			$this->Stack =& new clsRecursionStack();	
-			$sql = 'DELETE FROM inp_PermCache';
+			$sql = 'DELETE FROM '.GetTablePrefix().'PermCache';
 			$this->conn->Execute($sql);
 			$this->initData();
 		}
@@ -248,7 +248,7 @@
 	
 	function QueryChildren(&$data)
 	{
-		$sql = sprintf('SELECT CategoryId From inp_Category WHERE ParentId = %s',
+		$sql = sprintf('SELECT CategoryId From '.GetTablePrefix().'Category WHERE ParentId = %s',
 										$data['current_id']);
 		$rs = $this->conn->Execute($sql);
 		
@@ -262,8 +262,8 @@
 	
 	function QueryPermissions(&$data)
 	{
-		$sql = sprintf('SELECT ipc.PermissionConfigId, ip.GroupId, ip.PermissionValue FROM inp_Permissions AS ip
-										LEFT JOIN inp_PermissionConfig AS ipc
+		$sql = sprintf('SELECT ipc.PermissionConfigId, ip.GroupId, ip.PermissionValue FROM '.GetTablePrefix().'Permissions AS ip
+										LEFT JOIN '.GetTablePrefix().'PermissionConfig AS ipc
 										ON ipc.PermissionName = ip.Permission
 										WHERE CatId = %s AND Permission LIKE "%%.VIEW"',
 										$data['current_id']);