Index: branches/5.2.x/units/addresses/addresses_event_handler.php =================================================================== diff -u -N -r14258 -r14625 --- branches/5.2.x/units/addresses/addresses_event_handler.php (.../addresses_event_handler.php) (revision 14258) +++ branches/5.2.x/units/addresses/addresses_event_handler.php (.../addresses_event_handler.php) (revision 14625) @@ -1,6 +1,6 @@ Application->isAdminUser) { return ; @@ -76,13 +79,17 @@ * Ensures, that user have only one "use as billing" / "use as shipping" address * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemUpdate(&$event) + protected function OnBeforeItemUpdate(&$event) { + parent::OnBeforeItemUpdate($event); + $object =& $event->getObject(); /* @var $object kDBItem */ - if (!$object->isLoaded() || !$this->checkItemStatus($event)) { + if ( !$object->isLoaded() || !$this->checkItemStatus($event) ) { // not trivially loaded object OR not current user address $event->status = kEvent::erPERM_FAIL; return ; @@ -139,8 +146,10 @@ * Fills states for object country * * @param kEvent $event + * @return void + * @access protected */ - function OnAfterItemLoad(&$event) + protected function OnAfterItemLoad(&$event) { parent::OnAfterItemLoad($event); @@ -284,10 +293,14 @@ * Disables Guest ability to create addresses * * @param kEvent $event + * @return void + * @access protected */ - function OnBeforeItemCreate(&$event) + protected function OnBeforeItemCreate(&$event) { - if (!$this->Application->LoggedIn()) { + parent::OnBeforeItemCreate($event); + + if ( !$this->Application->LoggedIn() ) { $event->status = kEvent::erPERM_FAIL; return ; }