Index: branches/5.2.x/units/topics/topics_config.php =================================================================== diff -u -r15008 -r15133 --- branches/5.2.x/units/topics/topics_config.php (.../topics_config.php) (revision 15008) +++ branches/5.2.x/units/topics/topics_config.php (.../topics_config.php) (revision 15133) @@ -1,6 +1,6 @@ 'bb', 'ItemClass' => Array ('class' => 'kCatDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), 'ListClass' => Array ('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'TopicsEventHandler', 'file' => 'topics_event_handler.php', 'require_classes' => Array ('kCatDBEventHandler'), 'build_event' => 'OnBuild'), - 'TagProcessorClass' => Array ('class' => 'TopicsTagProcessor', 'file' => 'topics_tag_processor.php', 'require_classes' => Array ('kCatDBTagProcessor'), 'build_event' => 'OnBuild'), + 'EventHandlerClass' => Array ('class' => 'TopicsEventHandler', 'file' => 'topics_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'TopicsTagProcessor', 'file' => 'topics_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'QueryString' => Array ( 1 => 'id', Index: branches/5.2.x/units/emoticons/emoticon_eh.php =================================================================== diff -u -r15060 -r15133 --- branches/5.2.x/units/emoticons/emoticon_eh.php (.../emoticon_eh.php) (revision 15060) +++ branches/5.2.x/units/emoticons/emoticon_eh.php (.../emoticon_eh.php) (revision 15133) @@ -1,6 +1,6 @@ Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'), 'RegisterClasses' => Array ( - Array('pseudo' => 'PostHelper', 'class' => 'PostHelper','file' => 'post_helper.php', 'build_event' => '', 'require_classes' => Array('kHelper')), + Array('pseudo' => 'PostHelper', 'class' => 'PostHelper','file' => 'post_helper.php', 'build_event' => ''), ), ); \ No newline at end of file Index: branches/5.2.x/units/private_messages/private_message_eh.php =================================================================== diff -u -r15060 -r15133 --- branches/5.2.x/units/private_messages/private_message_eh.php (.../private_message_eh.php) (revision 15060) +++ branches/5.2.x/units/private_messages/private_message_eh.php (.../private_message_eh.php) (revision 15133) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBItem */ @@ -271,7 +271,7 @@ * @return void * @access protected */ - protected function OnNew(kEvent &$event) + protected function OnNew(kEvent $event) { parent::OnNew($event); Index: branches/5.2.x/units/topics/topics_event_handler.php =================================================================== diff -u -r15060 -r15133 --- branches/5.2.x/units/topics/topics_event_handler.php (.../topics_event_handler.php) (revision 15060) +++ branches/5.2.x/units/topics/topics_event_handler.php (.../topics_event_handler.php) (revision 15133) @@ -1,6 +1,6 @@ Name == 'OnTopicLockToggle' ) { $object =& $event->getObject(); @@ -52,7 +52,7 @@ * * @param kEvent $event */ - function OnToggleLock(&$event) + function OnToggleLock($event) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -69,7 +69,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(kEvent &$event) + protected function OnBeforeItemUpdate(kEvent $event) { parent::OnBeforeItemUpdate($event); @@ -83,7 +83,7 @@ * @return void * @access protected */ - protected function OnBeforeItemCreate(kEvent &$event) + protected function OnBeforeItemCreate(kEvent $event) { parent::OnBeforeItemCreate($event); @@ -109,7 +109,7 @@ * @return void * @access protected */ - protected function OnAfterItemCreate(kEvent &$event) + protected function OnAfterItemCreate(kEvent $event) { parent::OnAfterItemCreate($event); @@ -144,7 +144,7 @@ * @return void * @access protected */ - protected function OnAfterItemUpdate(kEvent &$event) + protected function OnAfterItemUpdate(kEvent $event) { parent::OnAfterItemUpdate($event); @@ -175,7 +175,7 @@ * @return void * @access protected */ - protected function OnAfterItemLoad(kEvent &$event) + protected function OnAfterItemLoad(kEvent $event) { parent::OnAfterItemLoad($event); @@ -192,7 +192,7 @@ * * @param kEvent $event */ - function OnTopicLockToggle(&$event) + function OnTopicLockToggle($event) { $object =& $event->getObject(); /* @var $object kCatDBItem */ @@ -209,7 +209,7 @@ * @return void * @access protected */ - protected function OnAfterConfigRead(kEvent &$event) + protected function OnAfterConfigRead(kEvent $event) { parent::OnAfterConfigRead($event); @@ -231,7 +231,7 @@ * @return void * @access protected */ - protected function OnCloneSubItem(kEvent &$event) + protected function OnCloneSubItem(kEvent $event) { parent::OnCloneSubItem($event); Index: branches/5.2.x/units/posts/post_eh.php =================================================================== diff -u -r15060 -r15133 --- branches/5.2.x/units/posts/post_eh.php (.../post_eh.php) (revision 15060) +++ branches/5.2.x/units/posts/post_eh.php (.../post_eh.php) (revision 15133) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBItem */ @@ -118,7 +118,7 @@ * @return void * @access protected */ - protected function OnBeforeItemUpdate(kEvent &$event) + protected function OnBeforeItemUpdate(kEvent $event) { parent::OnBeforeItemUpdate($event); @@ -150,7 +150,7 @@ * @return void * @access protected */ - protected function OnAfterItemUpdate(kEvent &$event) + protected function OnAfterItemUpdate(kEvent $event) { parent::OnAfterItemUpdate($event); @@ -164,7 +164,7 @@ * @return void * @access protected */ - protected function OnBeforeItemDelete(kEvent &$event) + protected function OnBeforeItemDelete(kEvent $event) { parent::OnBeforeItemDelete($event); @@ -183,7 +183,7 @@ * @return void * @access protected */ - protected function OnAfterItemLoad(kEvent &$event) + protected function OnAfterItemLoad(kEvent $event) { parent::OnAfterItemLoad($event); @@ -209,7 +209,7 @@ * @return void * @access protected */ - protected function OnAfterItemCreate(kEvent &$event) + protected function OnAfterItemCreate(kEvent $event) { parent::OnAfterItemCreate($event); @@ -261,8 +261,7 @@ if ( (int)$auto_lock > 0 ) { if ( $posts_count >= $auto_lock ) { // user has unlocked topic after $auto_lock and posts again -> ensure that topic will be locked again - $lock_event = new kEvent($parent_prefix . ':OnTopicLockToggle'); - $this->Application->HandleEvent($lock_event); + $this->Application->HandleEvent(new kEvent($parent_prefix . ':OnTopicLockToggle')); } } } @@ -273,7 +272,7 @@ * @param kEvent $event * @param kCatDBItem $main_object */ - function updateTopicInfo(&$event, &$main_object) + function updateTopicInfo($event, &$main_object) { $object =& $event->getObject(); /* @var $object kDBItem */ @@ -296,7 +295,7 @@ * @return void * @access protected */ - protected function OnCreate(kEvent &$event) + protected function OnCreate(kEvent $event) { parent::OnCreate($event); @@ -313,7 +312,7 @@ * @return void * @access protected */ - protected function OnUpdate(kEvent &$event) + protected function OnUpdate(kEvent $event) { parent::OnUpdate($event); @@ -331,7 +330,7 @@ * @return void * @access protected */ - protected function OnAfterItemDelete(kEvent &$event) + protected function OnAfterItemDelete(kEvent $event) { parent::OnAfterItemDelete($event); @@ -386,7 +385,7 @@ * @return void * @access protected */ - protected function OnAfterConfigRead(kEvent &$event) + protected function OnAfterConfigRead(kEvent $event) { parent::OnAfterConfigRead($event); @@ -404,7 +403,7 @@ * @return void * @access protected */ - protected function OnDelete(kEvent &$event) + protected function OnDelete(kEvent $event) { parent::OnDelete($event); @@ -421,7 +420,7 @@ * @return void * @access protected */ - protected function OnNew(kEvent &$event) + protected function OnNew(kEvent $event) { parent::OnNew($event); Index: branches/5.2.x/units/poll_comments/poll_comment_eh.php =================================================================== diff -u -r15060 -r15133 --- branches/5.2.x/units/poll_comments/poll_comment_eh.php (.../poll_comment_eh.php) (revision 15060) +++ branches/5.2.x/units/poll_comments/poll_comment_eh.php (.../poll_comment_eh.php) (revision 15133) @@ -1,6 +1,6 @@ Application->isAdmin ) { $object =& $event->getObject(); @@ -123,7 +123,7 @@ * @return void * @access protected */ - protected function OnCreate(kEvent &$event) + protected function OnCreate(kEvent $event) { parent::OnCreate($event); @@ -141,7 +141,7 @@ * @return void * @access protected */ - protected function OnAfterItemCreate(kEvent &$event) + protected function OnAfterItemCreate(kEvent $event) { parent::OnAfterItemCreate($event); Index: branches/5.2.x/units/polls/poll_eh.php =================================================================== diff -u -r15060 -r15133 --- branches/5.2.x/units/polls/poll_eh.php (.../poll_eh.php) (revision 15060) +++ branches/5.2.x/units/polls/poll_eh.php (.../poll_eh.php) (revision 15133) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBItem */ @@ -89,7 +89,7 @@ * @return void * @access protected */ - protected function OnBeforeItemCreate(kEvent &$event) + protected function OnBeforeItemCreate(kEvent $event) { parent::OnBeforeItemCreate($event); @@ -104,7 +104,7 @@ * * @param kEvent $event */ - function OnMakeVote(&$event) + function OnMakeVote($event) { $object =& $event->getObject($this->Application->GetVar('poll_id')); /* @var $object kDBItem */ @@ -157,7 +157,7 @@ * @return void * @access protected */ - protected function OnAfterItemDelete(kEvent &$event) + protected function OnAfterItemDelete(kEvent $event) { parent::OnAfterItemDelete($event);