Index: branches/5.2.x/units/product_options/product_options_event_handler.php
===================================================================
diff -u -N -r14625 -r14986
--- branches/5.2.x/units/product_options/product_options_event_handler.php	(.../product_options_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/product_options/product_options_event_handler.php	(.../product_options_event_handler.php)	(revision 14986)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_options_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: product_options_event_handler.php 14986 2012-01-04 16:11:56Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -23,16 +23,18 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
 			parent::SetCustomQuery($event);
 
-			$object =& $event->getObject();
 			$selectable_only = $event->getEventParam('selectable_only');
-			if ($selectable_only) {
+
+			if ( $selectable_only ) {
+				$object =& $event->getObject();
+				/* @var $object kDBList */
+
 				$object->addFilter('types_filter', 'OptionType IN (1,3,6)');
 			}
-
 		}
 
 		/**