Index: branches/5.2.x/units/emoticons/emoticon_eh.php
===================================================================
diff -u -N -r14252 -r15060
--- branches/5.2.x/units/emoticons/emoticon_eh.php	(.../emoticon_eh.php)	(revision 14252)
+++ branches/5.2.x/units/emoticons/emoticon_eh.php	(.../emoticon_eh.php)	(revision 15060)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: emoticon_eh.php 14252 2011-03-16 21:26:29Z alex $
+* @version	$Id: emoticon_eh.php 15060 2012-01-17 14:31:07Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -16,20 +16,21 @@
 
 	class EmoticonEventHandler extends kDBEventHandler {
 
-
 		/**
 		 * Deletes image file
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
 			parent::OnAfterItemDelete($event);
 
 			$object =& $event->getObject();
 
 			$emoticon_file = $object->GetField('EmotionImage', 'full_path');
-			if ($emoticon_file) {
+			if ( $emoticon_file ) {
 				@unlink($emoticon_file);
 			}
 		}
Index: branches/5.2.x/units/private_message_body/private_message_body_eh.php
===================================================================
diff -u -N -r14624 -r15060
--- branches/5.2.x/units/private_message_body/private_message_body_eh.php	(.../private_message_body_eh.php)	(revision 14624)
+++ branches/5.2.x/units/private_message_body/private_message_body_eh.php	(.../private_message_body_eh.php)	(revision 15060)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_message_body_eh.php 14624 2011-10-04 09:33:21Z alex $
+* @version	$Id: private_message_body_eh.php 15060 2012-01-17 14:31:07Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -23,7 +23,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -47,13 +47,17 @@
 		 * Deletes message body only when no message is using it
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemDelete(&$event)
+		protected function OnBeforeItemDelete(kEvent &$event)
 		{
+			parent::OnBeforeItemDelete($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			if ($object->GetDBField('ReferenceCount') > 0) {
+			if ( $object->GetDBField('ReferenceCount') > 0 ) {
 				$event->status = kEvent::erFAIL;
 			}
 		}
Index: branches/5.2.x/units/private_messages/private_message_eh.php
===================================================================
diff -u -N -r14985 -r15060
--- branches/5.2.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 14985)
+++ branches/5.2.x/units/private_messages/private_message_eh.php	(.../private_message_eh.php)	(revision 15060)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: private_message_eh.php 14985 2012-01-04 16:04:11Z alex $
+* @version	$Id: private_message_eh.php 15060 2012-01-17 14:31:07Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -77,7 +77,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -102,7 +102,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -145,7 +145,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -168,12 +168,14 @@
 		 * Goes to next_template after post creation
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			parent::OnCreate($event);
 
-			if ($event->status == kEvent::erSUCCESS && !$this->Application->isAdmin) {
+			if ( $event->status == kEvent::erSUCCESS && !$this->Application->isAdmin ) {
 				$event->SetRedirectParam('opener', 's');
 				$event->redirect = $this->Application->GetVar('next_template');
 			}
@@ -183,35 +185,45 @@
 		 * Prevents user from deleting other user private messages
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemDelete(&$event)
+		protected function OnBeforeItemDelete(kEvent &$event)
 		{
+			parent::OnBeforeItemDelete($event);
+
 			$object =& $event->getObject();
-	    	/* @var $object kDBItem */
+			/* @var $object kDBItem */
 
 			$user_id = $this->Application->RecallVar('user_id');
 			$owner_field = ($object->GetDBField('FolderId') == PM_FOLDER_INBOX) ? 'ToId' : 'FromId';
-			if ($object->GetDBField($owner_field) != $user_id) {
-	    		$event->status = kEvent::erFAIL;
-	    	}
+
+			if ( $object->GetDBField($owner_field) != $user_id ) {
+				$event->status = kEvent::erFAIL;
+			}
 		}
 
 		/**
 		 * Updates reference counter in message body record
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
-	    	$object =& $event->getObject();
-	    	/* @var $object kDBItem */
+	    	parent::OnAfterItemDelete($event);
 
-	    	$body_idfield = $this->Application->getUnitOption($event->Prefix.'-body', 'IDField');
-	    	$body_table = $this->Application->getUnitOption($event->Prefix.'-body', 'TableName');
-	    	$sql = 'UPDATE '.$body_table.'
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$body_idfield = $this->Application->getUnitOption($event->Prefix . '-body', 'IDField');
+			$body_table = $this->Application->getUnitOption($event->Prefix . '-body', 'TableName');
+
+			$sql = 'UPDATE ' . $body_table . '
 	    			SET ReferenceCount = ReferenceCount - 1
-	    			WHERE '.$body_idfield.' = '.$object->GetDBField('PMBodyId');
-	    	$this->Conn->Query($sql);
+	    			WHERE ' . $body_idfield . ' = ' . $object->GetDBField('PMBodyId');
+			$this->Conn->Query($sql);
 		}
 
 		/**
@@ -256,8 +268,10 @@
 		 * Prepares new reply & new message form
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
 			parent::OnNew($event);
 
@@ -267,17 +281,17 @@
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			if ($reply_to > 0) {
+			if ( $reply_to > 0 ) {
 				// reply to message
-				$source_msg =& $this->Application->recallObject($event->Prefix.'.-item', null, Array ('skip_autoload' => true));
+				$source_msg =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
 				/* @var $source_msg kDBItem */
 
 				$source_msg->Load($reply_to);
 
 				$object->SetDBField('ToId', $source_msg->GetDBField('FromId'));
-				$object->SetDBField('Subject', 'Re: '.$source_msg->GetDBField('Subject'));
+				$object->SetDBField('Subject', 'Re: ' . $source_msg->GetDBField('Subject'));
 			}
-			elseif ($user_id > 0) {
+			elseif ( $user_id > 0 ) {
 				// send message to any user by id
 				$object->SetDBField('ToId', $user_id);
 			}
Index: branches/5.2.x/units/topics/topics_event_handler.php
===================================================================
diff -u -N -r14985 -r15060
--- branches/5.2.x/units/topics/topics_event_handler.php	(.../topics_event_handler.php)	(revision 14985)
+++ branches/5.2.x/units/topics/topics_event_handler.php	(.../topics_event_handler.php)	(revision 15060)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: topics_event_handler.php 14985 2012-01-04 16:04:11Z alex $
+* @version	$Id: topics_event_handler.php 15060 2012-01-17 14:31:07Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -55,6 +55,7 @@
 		function OnToggleLock(&$event)
 		{
 			$object =& $event->getObject();
+			/* @var $object kDBItem */
 
 			$new_type = $object->GetDBField('TopicType') ? 0 : 1;
 			$object->SetDBField('TopicType', $new_type);
@@ -68,7 +69,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -82,7 +83,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -108,7 +109,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -140,23 +141,27 @@
 		 * Approves 1st post when topic got approved
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
-			if (!$this->Application->isAdminUser) {
-				return ;
+			parent::OnAfterItemUpdate($event);
+
+			if ( !$this->Application->isAdminUser ) {
+				return;
 			}
 
 			$object =& $event->getObject();
 			/* @var $object kCatDBItem */
 
-			if ($object->GetDBField('Posts') == 1) {
-				$post =& $this->Application->recallObject($event->Prefix.'-post', null, Array('skip_autoload' => true));
+			if ( $object->GetDBField('Posts') == 1 ) {
+				$post =& $this->Application->recallObject($event->Prefix . '-post', null, Array ('skip_autoload' => true));
 				/* @var $post kDBItem */
 
 				$main_status = $object->GetDBField('Status');
 				$post->Load($object->GetDBField('LastPostId'));
-				if ($post->isLoaded()) {
+				if ( $post->isLoaded() ) {
 					$post->SetDBField('Pending', $main_status == STATUS_ACTIVE ? 0 : 1);
 					$post->Update();
 				}
@@ -170,7 +175,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -223,12 +228,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;
 
Index: branches/5.2.x/units/posts/post_eh.php
===================================================================
diff -u -N -r15008 -r15060
--- branches/5.2.x/units/posts/post_eh.php	(.../post_eh.php)	(revision 15008)
+++ branches/5.2.x/units/posts/post_eh.php	(.../post_eh.php)	(revision 15060)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: post_eh.php 15008 2012-01-06 20:37:30Z alex $
+* @version	$Id: post_eh.php 15060 2012-01-17 14:31:07Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -41,7 +41,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -118,7 +118,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -147,8 +147,10 @@
 		 * Notifies admin about post change
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -159,14 +161,17 @@
 		 * Checks, that user can delete post
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemDelete(&$event)
+		protected function OnBeforeItemDelete(kEvent &$event)
 		{
+			parent::OnBeforeItemDelete($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			$perm_status = $this->checkPostPermission($event, 'TOPIC.REPLY.OWNER.DELETE|TOPIC.REPLY.DELETE');
-			if (!$perm_status) {
+			if ( !$this->checkPostPermission($event, 'TOPIC.REPLY.OWNER.DELETE|TOPIC.REPLY.DELETE') ) {
 				$event->status = kEvent::erFAIL;
 			}
 		}
@@ -178,7 +183,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -204,7 +209,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -288,12 +293,14 @@
 		 * Goes to next_template after post creation
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			parent::OnCreate($event);
 
-			if ($event->status == kEvent::erSUCCESS && !$this->Application->isAdmin) {
+			if ( $event->status == kEvent::erSUCCESS && !$this->Application->isAdmin ) {
 				$event->SetRedirectParam('opener', 's');
 				$event->redirect = $this->Application->GetVar('next_template');
 			}
@@ -321,16 +328,20 @@
 		 * Moves reference to last post in topic, when it is deleted
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
+			parent::OnAfterItemDelete($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
 			$topic_id = $object->GetDBField('TopicId');
-			if (!$topic_id) {
+			if ( !$topic_id ) {
 				// deleting non-existing post
-				return ;
+				return;
 			}
 
 			$post_helper =& $this->Application->recallObject('PostHelper');
@@ -340,31 +351,31 @@
 			$post_helper->updatePostCount($topic_id, -1);
 
 			// update post owner posts counter
-			$sql = 'UPDATE '.TABLE_PREFIX.'UserPersistentSessionData
+			$sql = 'UPDATE ' . TABLE_PREFIX . 'UserPersistentSessionData
 					SET VariableValue = IF (VariableValue > 0, VariableValue - 1, 0)
-					WHERE (PortalUserId = '.$object->GetDBField('CreatedById').') AND (VariableName = "bb_posts")';
+					WHERE (PortalUserId = ' . $object->GetDBField('CreatedById') . ') AND (VariableName = "bb_posts")';
 			$this->Conn->Query($sql);
 
 
-			$main_object =& $this->Application->recallObject('bb.-item', null, Array('skip_autoload' => true));
+			$main_object =& $this->Application->recallObject('bb.-item', null, Array ('skip_autoload' => true));
 			/* @var $main_object kCatDBItem */
 
 			$main_object->Load($topic_id);
 
 			$post_helper->updateTodayPostsCount($main_object, $object->GetDBField('CreatedOn'), -1);
 
-			if ($main_object->GetDBField('LastPostId') == $object->GetID()) {
+			if ( $main_object->GetDBField('LastPostId') == $object->GetID() ) {
 				$sql = 'SELECT PostingId, CreatedOn
-						FROM '.$object->TableName.'
-						WHERE TopicId = '.$topic_id.'
+						FROM ' . $object->TableName . '
+						WHERE TopicId = ' . $topic_id . '
 						ORDER BY PostingId DESC';
 				$last_post = $this->Conn->GetRow($sql);
 
 				$fields_hash = Array (
 					'LastPostId' => $last_post['PostingId'],
 					'LastPostDate' => $last_post['CreatedOn'],
 				);
-				$this->Conn->doUpdate($fields_hash, $main_object->TableName, $main_object->IDField.' = '.$topic_id);
+				$this->Conn->doUpdate($fields_hash, $main_object->TableName, $main_object->IDField . ' = ' . $topic_id);
 			}
 		}
 
@@ -390,39 +401,43 @@
 		 * Deletes items & preserves clean env
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnDelete(&$event)
+		protected function OnDelete(kEvent &$event)
 		{
 			parent::OnDelete($event);
 
-			if ($event->status == kEvent::erSUCCESS && !$this->Application->isAdmin) {
+			if ( $event->status == kEvent::erSUCCESS && !$this->Application->isAdmin ) {
 				$parent_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix');
-				$event->SetRedirectParam('pass', 'm,'.$parent_prefix);
+				$event->SetRedirectParam('pass', 'm,' . $parent_prefix);
 			}
 		}
 
 		/**
 		 * Prepares new reply form
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
 			parent::OnNew($event);
 
 			$reply_to = $this->Application->GetVar('reply_to');
 
-			if ($reply_to > 0) {
+			if ( $reply_to > 0 ) {
 				$object =& $event->getObject();
 				/* @var $object kDBItem */
 
-				$source_post =& $this->Application->recallObject($event->Prefix.'.-item', null, Array ('skip_autoload' => true));
+				$source_post =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
 				/* @var $source_post kDBItem */
 
 				$source_post->Load($reply_to);
 
-				$object->SetDBField('Subject', 'Re: '.$source_post->GetDBField('Subject'));
-				$object->SetDBField('PostingText', '[quote id='.$reply_to.']'.$source_post->GetDBField('PostingText').'[/quote]');
+				$object->SetDBField('Subject', 'Re: ' . $source_post->GetDBField('Subject'));
+				$object->SetDBField('PostingText', '[quote id=' . $reply_to . ']' . $source_post->GetDBField('PostingText') . '[/quote]');
 			}
 		}
 	}
\ No newline at end of file
Index: branches/5.2.x/units/poll_comments/poll_comment_eh.php
===================================================================
diff -u -N -r14985 -r15060
--- branches/5.2.x/units/poll_comments/poll_comment_eh.php	(.../poll_comment_eh.php)	(revision 14985)
+++ branches/5.2.x/units/poll_comments/poll_comment_eh.php	(.../poll_comment_eh.php)	(revision 15060)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_comment_eh.php 14985 2012-01-04 16:04:11Z alex $
+* @version	$Id: poll_comment_eh.php 15060 2012-01-17 14:31:07Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -84,54 +84,50 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
-			if ( $this->Application->isAdminUser ) {
-				return ;
-			}
+			if ( !$this->Application->isAdmin ) {
+				$object =& $event->getObject();
+				/* @var $object kDBItem */
 
-			$object =& $event->getObject();
-			/* @var $object kDBItem */
+				$parent_info = $object->getLinkedInfo($event->Special);
+				$poll_id = $parent_info['ParentId'];
 
-			$parent_info = $object->getLinkedInfo($event->Special);
-			$poll_id = $parent_info['ParentId'];
+				if ( $poll_id ) {
+					$spam_helper =& $this->Application->recallObject('SpamHelper');
+					/* @var $spam_helper SpamHelper */
 
-			if ( $poll_id ) {
-				$spam_helper =& $this->Application->recallObject('SpamHelper');
-				/* @var $spam_helper SpamHelper */
+					$spam_helper->InitHelper($poll_id, 'PollComment', 0); // ResourceId used for SpamControl only
 
-				$spam_helper->InitHelper($poll_id, 'PollComment', 0); // ResourceId used for SpamControl only
+					if ( $spam_helper->InSpamControl() ) {
+						$event->status = kEvent::erFAIL;
+						$object->SetError('CommentText', 'too_frequent', 'lu_error_AlreadyCommented');
+						return ;
+					}
 
-				if ( $spam_helper->InSpamControl() ) {
-					$event->status = kEvent::erFAIL;
-					$object->SetError('CommentText', 'too_frequent', 'lu_error_AlreadyCommented');
-					return ;
+					$object->SetDBField('PollId', $poll_id); // PollId
 				}
 
-				$object->SetDBField('PollId', $poll_id); // PollId
+				$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
+				$object->SetDBField('UserIP', $_SERVER['REMOTE_ADDR']);
+				$object->SetDBField('Status', STATUS_ACTIVE);
 			}
 
-			$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
-			$object->SetDBField('UserIP', $_SERVER['REMOTE_ADDR']);
-			$object->SetDBField('Status', STATUS_ACTIVE);
-
 			parent::OnBeforeItemCreate($event);
 		}
 
 		/**
 		 * Updates item review counter
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			parent::OnCreate($event);
 
-			if ($this->Application->isAdminUser) {
-				return;
-			}
-
-			if ($event->status == kEvent::erSUCCESS) {
+			if ( !$this->Application->isAdmin && $event->status == kEvent::erSUCCESS ) {
 				$event->setRedirectParam('opener', 's');
 				$event->setRedirectParam('pass', 'm,poll');
 				$event->redirect = $this->Application->GetVar('success_template');
@@ -145,7 +141,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
Index: branches/5.2.x/units/polls/poll_eh.php
===================================================================
diff -u -N -r14985 -r15060
--- branches/5.2.x/units/polls/poll_eh.php	(.../poll_eh.php)	(revision 14985)
+++ branches/5.2.x/units/polls/poll_eh.php	(.../poll_eh.php)	(revision 15060)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_eh.php 14985 2012-01-04 16:04:11Z alex $
+* @version	$Id: poll_eh.php 15060 2012-01-17 14:31:07Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -89,7 +89,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -150,19 +150,22 @@
 			$event->redirect = false;
 		}
 
-
 		/**
 		 * Cleanup by removing items from PollStatistics before Poll is deleted
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
+			parent::OnAfterItemDelete($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			$sql = 'DELETE FROM '.TABLE_PREFIX.'PollsStatistics
-						WHERE PollId = '.$object->GetID();
+			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'PollsStatistics
+					WHERE PollId = ' . $object->GetID();
 			$this->Conn->Query($sql);
 		}
 	}
\ No newline at end of file