Index: branches/5.3.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r15483 -r15677
--- branches/5.3.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 15483)
+++ branches/5.3.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 15445 2012-07-13 16:44:00Z alex $
+* @version	$Id: categories_event_handler.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -876,7 +876,7 @@
 					if ( $new_status != $old_statuses[$category_id] && in_array($new_status, $process_statuses) ) {
 						$object->Load($category_id);
 						$email_event = $new_status == STATUS_ACTIVE ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY';
-						$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
+						$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'));
 					}
 				}
 			}
@@ -1450,8 +1450,8 @@
 			$perm_prefix = $this->Application->getUnitOption($event->Prefix, 'PermItemPrefix');
 
 			$event_suffix = $is_active ? 'ADD' : 'ADD.PENDING';
-			$this->Application->EmailEventAdmin($perm_prefix . '.' . $event_suffix);
-			$this->Application->EmailEventUser($perm_prefix . '.' . $event_suffix, $object->GetDBField('CreatedById'));
+			$this->Application->emailAdmin($perm_prefix . '.' . $event_suffix);
+			$this->Application->emailUser($perm_prefix . '.' . $event_suffix, $object->GetDBField('CreatedById'));
 		}
 
 		/**
@@ -1527,8 +1527,8 @@
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ( $ids ) {
+				$status_field = $object->getStatusField();
 				$propagate_category_status = $this->Application->GetVar('propagate_category_status');
-				$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
 
 				foreach ($ids as $id) {
 					$object->Load($id);
@@ -1545,7 +1545,7 @@
 						$event->status = kEvent::erSUCCESS;
 
 						$email_event = $event->Name == 'OnMassApprove' ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY';
-						$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
+						$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'));
 					}
 					else {
 						$event->status = kEvent::erFAIL;
@@ -2283,8 +2283,7 @@
 				return;
 			}
 
-			set_time_limit(0);
-			ini_set('memory_limit', -1);
+			kUtil::setResourceLimit();
 
 			$dummy = $this->Application->recallObject($event->Prefix . '.rebuild', NULL, Array ('skip_autoload' => true));
 			/* @var $dummy CategoriesItem */