Index: branches/5.2.x/units/polls/poll_eh.php
===================================================================
diff -u -N -r14676 -r14985
--- branches/5.2.x/units/polls/poll_eh.php	(.../poll_eh.php)	(revision 14676)
+++ branches/5.2.x/units/polls/poll_eh.php	(.../poll_eh.php)	(revision 14985)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_eh.php 14676 2011-10-19 08:30:04Z alex $
+* @version	$Id: poll_eh.php 14985 2012-01-04 16:04:11Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -19,15 +19,20 @@
 		/**
 		 * Allows to override standard permission mapping
 		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
 		 */
-		function mapPermissions()
+		protected function mapPermissions()
 		{
 			parent::mapPermissions();
-			$permissions = Array(
-									'OnResetVotes'	=>	Array('self' => 'edit'),
-									'OnMakeVote'	=>	Array('self' => true),
-									'OnItemBuild'	=>	Array('self' => true),
-							);
+
+			$permissions = Array (
+				'OnResetVotes'	=>	Array ('self' => 'edit'),
+				'OnMakeVote'	=>	Array ('self' => true),
+				'OnItemBuild'	=>	Array ('self' => true),
+			);
+
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
@@ -39,17 +44,19 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
-			if ($this->Application->isAdminUser) {
-				return ;
+			parent::SetCustomQuery($event);
+
+			if ( $this->Application->isAdminUser ) {
+				return;
 			}
 
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
-			$object->addFilter('poll_range_filter', '(%1$s.StartDate <= ' .adodb_mktime(). ') AND (%1$s.EndDate >= ' .adodb_mktime(). ' OR EndDate IS NULL)');
-			$object->addFilter('poll_status', '(%1$s.Status = ' .STATUS_ACTIVE. ')');
+			$object->addFilter('poll_range_filter', '(%1$s.StartDate <= ' . adodb_mktime() . ') AND (%1$s.EndDate >= ' . adodb_mktime() . ' OR EndDate IS NULL)');
+			$object->addFilter('poll_status', '(%1$s.Status = ' . STATUS_ACTIVE . ')');
 		}
 
 		/**