Index: branches/5.2.x/core/units/modules/modules_event_handler.php
===================================================================
diff -u -N -r14787 -r14989
--- branches/5.2.x/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 14787)
+++ branches/5.2.x/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 14989)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: modules_event_handler.php 14787 2011-11-23 13:25:06Z alex $
+* @version	$Id: modules_event_handler.php 14989 2012-01-04 16:24:42Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -17,14 +17,17 @@
 	class ModulesEventHandler extends kDBEventHandler {
 
 		/**
-		 * Builds item
+		 * Builds item (loads if needed)
 		 *
+		 * Pattern: Prototype Manager
+		 *
 		 * @param kEvent $event
 		 * @access protected
 		 */
-		function OnItemBuild(&$event)
+		protected function OnItemBuild(kEvent &$event)
 		{
-			$this->Application->SetVar($event->getPrefixSpecial(true).'_id', $event->Special);
+			$this->Application->SetVar($event->getPrefixSpecial(true) . '_id', $event->Special);
+
 			parent::OnItemBuild($event);
 		}
 
@@ -36,21 +39,31 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
+			parent::SetCustomQuery($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
-			if ($event->Special) {
-				$object->addFilter('current_module', '%1$s.Name = '.$event->Special);
+			if ( $event->Special ) {
+				$object->addFilter('current_module', '%1$s.Name = ' . $event->Special);
 			}
 
 			$object->addFilter('not_core', '%1$s.Name <> "Core"');
 		}
 
-		function mapEvents()
+		/**
+		 * Define alternative event processing method names
+		 *
+		 * @return void
+		 * @see kEventHandler::$eventMethods
+		 * @access protected
+		 */
+		protected function mapEvents()
 		{
 			parent::mapEvents();
+
 			$this->eventMethods['OnMassApprove'] = 'moduleAction';
 			$this->eventMethods['OnMassDecline'] = 'moduleAction';
 		}