Index: branches/5.2.x/core/units/themes/themes_eh.php
===================================================================
diff -u -N -r14714 -r14989
--- branches/5.2.x/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 14714)
+++ branches/5.2.x/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 14989)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: themes_eh.php 14714 2011-11-01 10:05:18Z alex $
+* @version	$Id: themes_eh.php 14989 2012-01-04 16:24:42Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -19,10 +19,14 @@
 		/**
 		 * Allows to override standard permission mapping
 		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
 		 */
-		function mapPermissions()
+		protected function mapPermissions()
 		{
 			parent::mapPermissions();
+
 			$permissions = Array(
 				'OnChangeTheme' => Array('self' => true),
 			);
@@ -37,9 +41,9 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(&$event)
+		public function CheckPermission(kEvent &$event)
 		{
-			if ($event->Name == 'OnItemBuild') {
+			if ( $event->Name == 'OnItemBuild' ) {
 				// check permission without using $event->getSection(),
 				// so first cache rebuild won't lead to "ldefault_Name" field being used
 				return true;
@@ -164,20 +168,20 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
 			parent::SetCustomQuery($event);
 
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
-			if (in_array($event->Special, Array ('enabled', 'selected', 'available')) || !$this->Application->isAdminUser) {
+			if ( in_array($event->Special, Array ('enabled', 'selected', 'available')) || !$this->Application->isAdminUser ) {
 				// "enabled" special or Front-End
 				$object->addFilter('enabled_filter', '%1$s.Enabled = ' . STATUS_ACTIVE);
 			}
 
 			// site domain theme picker
-			if ($event->Special == 'selected' || $event->Special == 'available') {
+			if ( $event->Special == 'selected' || $event->Special == 'available' ) {
 				$edit_picker_helper =& $this->Application->recallObject('EditPickerHelper');
 				/* @var $edit_picker_helper EditPickerHelper */
 
@@ -187,7 +191,7 @@
 			// apply domain-based theme filtering
 			$themes = $this->Application->siteDomainField('Themes');
 
-			if (strlen($themes)) {
+			if ( strlen($themes) ) {
 				$themes = explode('|', substr($themes, 1, -1));
 				$object->addFilter('domain_filter', '%1$s.ThemeId IN (' . implode(',', $themes) . ')');
 			}