Index: branches/5.2.x/units/links/links_event_handler.php =================================================================== diff -u -N -r14987 -r15062 --- branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 14987) +++ branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15062) @@ -1,6 +1,6 @@ status == kEvent::erSUCCESS) { - $object =& $event->getObject(); - /* @var $object kDBItem */ + if ( $event->status != kEvent::erSUCCESS ) { + return; + } - // replace 0 id in post with actual created id (used in enhancement process) - $items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); - kUtil::array_rename_key($items_info, 0, $object->GetID()); - $this->Application->SetVar($event->getPrefixSpecial(true), $items_info); + $object =& $event->getObject(); + /* @var $object kDBItem */ - // listing was created -> enhance it right away - $enhancement_event = new kEvent('ls:OnRequestEnhancement'); - $this->Application->HandleEvent($enhancement_event); - if (($enhancement_event->status == kEvent::erSUCCESS) && strlen($enhancement_event->redirect)) { - $event->SetRedirectParam('next_template', $event->redirect); - $event->redirect = $enhancement_event->redirect; - } + // replace 0 id in post with actual created id (used in enhancement process) + $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); + kUtil::array_rename_key($items_info, 0, $object->GetID()); + $this->Application->SetVar($event->getPrefixSpecial(true), $items_info); + + // listing was created -> enhance it right away + $enhancement_event = new kEvent('ls:OnRequestEnhancement'); + $this->Application->HandleEvent($enhancement_event); + + if ( ($enhancement_event->status == kEvent::erSUCCESS) && strlen($enhancement_event->redirect) ) { + $event->SetRedirectParam('next_template', $event->redirect); + $event->redirect = $enhancement_event->redirect; } } @@ -352,7 +357,7 @@ * @return void * @access protected */ - protected function OnBeforeItemCreate(&$event) + protected function OnBeforeItemCreate(kEvent &$event) { parent::OnBeforeItemCreate($event); @@ -366,7 +371,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(&$event) + protected function OnBeforeItemUpdate(kEvent &$event) { parent::OnBeforeItemUpdate($event); @@ -514,12 +519,14 @@ * [HOOK] Allows to add cloned subitem to given prefix * * @param kEvent $event + * @return void + * @access protected */ - function OnCloneSubItem(&$event) + protected function OnCloneSubItem(kEvent &$event) { parent::OnCloneSubItem($event); - if ($event->MasterEvent->Prefix == 'rev') { + if ( $event->MasterEvent->Prefix == 'rev' ) { $clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones'); $subitem_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix;