Index: branches/5.2.x/units/addresses/addresses_event_handler.php
===================================================================
diff -u -N -r15009 -r15061
--- branches/5.2.x/units/addresses/addresses_event_handler.php	(.../addresses_event_handler.php)	(revision 15009)
+++ branches/5.2.x/units/addresses/addresses_event_handler.php	(.../addresses_event_handler.php)	(revision 15061)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: addresses_event_handler.php 15009 2012-01-06 20:37:54Z alex $
+* @version	$Id: addresses_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
@@ -95,7 +95,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -133,23 +133,27 @@
 		}
 
 		/**
-		 * Creates new user
+		 * Creates new kDBItem
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			parent::OnCreate($event);
 
 			$this->setNextTemplate($event);
 		}
 
 		/**
-		 * Enter description here...
+		 * Sets next template to be shown after address is added/updated
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function setNextTemplate(&$event)
+		protected function setNextTemplate(kEvent &$event)
 		{
 			if ( $this->Application->isAdminUser ) {
 				return;
@@ -158,7 +162,7 @@
 			$event->SetRedirectParam('opener', 's');
 			$next_template = $this->Application->GetVar('next_template');
 
-			if ($next_template) {
+			if ( $next_template ) {
 				$event->redirect = $next_template;
 			}
 		}
@@ -170,7 +174,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -353,7 +357,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -384,10 +388,13 @@
 		 * deleted is stored as 'id' event param
 		 *
 		 * @param kEvent $event
-		 * @access public
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemDelete(&$event)
+		protected function OnBeforeItemDelete(kEvent &$event)
 		{
+			parent::OnBeforeItemDelete($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */