Index: branches/5.2.x/units/shipping/shipping_event_handler.php
===================================================================
diff -u -N -r15009 -r15061
--- branches/5.2.x/units/shipping/shipping_event_handler.php	(.../shipping_event_handler.php)	(revision 15009)
+++ branches/5.2.x/units/shipping/shipping_event_handler.php	(.../shipping_event_handler.php)	(revision 15061)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_event_handler.php 15009 2012-01-06 20:37:54Z alex $
+* @version	$Id: shipping_event_handler.php 15061 2012-01-17 14:50:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -41,7 +41,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemLoad(&$event)
+	protected function OnAfterItemLoad(kEvent &$event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -164,7 +164,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(&$event)
+	protected function OnSave(kEvent &$event)
 	{
 		$this->OnAfterItemLoad($event);
 
@@ -178,20 +178,39 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemCreate(&$event)
+	protected function OnAfterItemCreate(kEvent &$event)
 	{
 		parent::OnAfterItemCreate($event);
 
 		$event->CallSubEvent('OnAnyChange');
 	}
 
-	function OnAfterItemUpdate(&$event)
+	/**
+	 * Occurs after updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemUpdate(kEvent &$event)
 	{
+		parent::OnAfterItemUpdate($event);
+
 		$event->CallSubEvent('OnAnyChange');
 	}
 
-	function OnAfterItemDelete(&$event)
+	/**
+	 * Occurs after deleting item, id of deleted item
+	 * is stored as 'id' param of event
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemDelete(kEvent &$event)
 	{
+		parent::OnAfterItemDelete($event);
+
 		$event->CallSubEvent('OnAnyChange');
 	}
 
@@ -210,7 +229,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreSaveCreated(&$event)
+	protected function OnPreSaveCreated(kEvent &$event)
 	{
 		parent::OnPreSaveCreated($event);
 
@@ -220,20 +239,22 @@
 		$object->SetDBField('PortalGroups', ',' . $this->Application->ConfigValue('User_LoggedInGroup') . ',');
 	}
 
-	function UpdateGroups(&$event){
-		$object = &$event->getObject();
+	function UpdateGroups(&$event)
+	{
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
 
-		if ($event->Name == 'OnPreSaveCreated') {
+		if ( $event->Name == 'OnPreSaveCreated' ) {
 			$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
 			$selected_groups = $default_group;
 		}
 		else {
 			$selected_groups = $object->GetDBField('PortalGroups');
 		}
 
-		if ($selected_groups && $selected_groups!='') {
+		if ( $selected_groups && $selected_groups != '' ) {
 			$selected_groups = str_replace('|', ',', $selected_groups);
-			$selected_groups = ','.trim($selected_groups, ',').',';
+			$selected_groups = ',' . trim($selected_groups, ',') . ',';
 			$object->SetDBField('PortalGroups', $selected_groups);
 		}
 	}
@@ -246,7 +267,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(&$event, $type)
+	protected function customProcessing(kEvent &$event, $type)
 	{
 		$this->UpdateGroups($event);
 	}