Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
diff -u -N -r15061 -r15134
--- branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 15061)
+++ branches/5.2.x/units/product_option_combinations/product_option_combinations_event_handler.php	(.../product_option_combinations_event_handler.php)	(revision 15134)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_option_combinations_event_handler.php 15061 2012-01-17 14:50:00Z alex $
+* @version	$Id: product_option_combinations_event_handler.php 15134 2012-03-03 19:04:51Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -23,7 +23,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		if ( $type == 'after' ) {
 			return;
@@ -61,7 +61,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function GetOptionValues(&$event, $option_id)
+	function GetOptionValues($event, $option_id)
 	{
 		$object =& $event->getObject();
 		if ($object->IsTempTable()) {
@@ -74,7 +74,7 @@
 		return explode(',', $this->Conn->GetOne($query));
 	}
 
-	function CreateCombinations(&$event, $fields, $current_option=null)
+	function CreateCombinations($event, $fields, $current_option=null)
 	{
 		$recursed = false;
 		$combination = $fields['Combination'];
@@ -117,7 +117,7 @@
 		}
 	}
 
-	function UpdateCombinations(&$event, $fields, $current_option=null)
+	function UpdateCombinations($event, $fields, $current_option=null)
 	{
 		$recursed = false;
 		$combination = $fields['Combination'];
@@ -164,7 +164,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCreate(kEvent &$event)
+	protected function OnCreate(kEvent $event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -196,7 +196,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnUpdate(kEvent &$event)
+	protected function OnUpdate(kEvent $event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		/* @var $object kDBItem */
@@ -241,7 +241,7 @@
 	 * @param kEvent $event
 	 * @access protected
 	 */
-	protected function OnItemBuild(kEvent &$event)
+	protected function OnItemBuild(kEvent $event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -274,7 +274,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function LoadItem(kEvent &$event)
+	protected function LoadItem(kEvent $event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -302,7 +302,7 @@
 	 * @return string
 	 * @access protected
 	 */
-	protected function getMainSpecial(kEvent &$event)
+	protected function getMainSpecial(kEvent $event)
 	{
 		$special = $event->getEventParam('main_special');
 
@@ -325,7 +325,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeClone(kEvent &$event)
+	protected function OnBeforeClone(kEvent $event)
 	{
 		parent::OnBeforeClone($event);
 
@@ -363,7 +363,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeDeleteFromLive(kEvent &$event)
+	protected function OnBeforeDeleteFromLive(kEvent $event)
 	{
 		parent::OnBeforeDeleteFromLive($event);
 
@@ -405,7 +405,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSearch(kEvent &$event)
+	protected function OnSearch(kEvent $event)
 	{
 		parent::OnSearch($event);
 
@@ -419,7 +419,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSearchReset(kEvent &$event)
+	protected function OnSearchReset(kEvent $event)
 	{
 		parent::OnSearchReset($event);
 
@@ -431,7 +431,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function _saveProduct(&$event)
+	function _saveProduct($event)
 	{
 		$product_id = $this->Application->GetVar('p_id');