Index: trunk/kernel/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r2586 -r3031
--- trunk/kernel/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 2586)
+++ trunk/kernel/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 3031)
@@ -80,16 +80,14 @@
 		
 		$view_perm = 1;
 		$object->addFilter('perm_filter', 'PermId = '.$view_perm);
-		if (!defined('ADMIN')) {
+		if ( !$this->Application->IsAdmin() )
+		{
 			$groups = explode(',',$this->Application->RecallVar('UserGroups'));
 			foreach ($groups as $group) {
 				$view_filters[] = 'FIND_IN_SET('.$group.', acl) || ((NOT FIND_IN_SET('.$group.',dacl)) AND acl=\'\')';
 			}
 			$view_filter = implode(' OR ', $view_filters);
 			$object->addFilter('perm_filter2', $view_filter);
-		}
-		
-		if (!defined('ADMIN')) {
 			$object->addFilter('status_filter', $object->TableName.'.Status = 1');
 		}
 
@@ -214,7 +212,7 @@
 	
 	function GetPassedId(&$event)
 	{
-		if (defined('ADMIN')) return parent::getPassedID($event);
+		if ( $this->Application->IsAdmin() ) return parent::getPassedID($event);
 		
 		$ret = $this->Application->GetVar('m_cat_id');
 		if($ret) return $ret;