Index: branches/5.2.x/units/product_options/product_options_helper.php
===================================================================
diff -u -N -r14258 -r14702
--- branches/5.2.x/units/product_options/product_options_helper.php	(.../product_options_helper.php)	(revision 14258)
+++ branches/5.2.x/units/product_options/product_options_helper.php	(.../product_options_helper.php)	(revision 14702)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_options_helper.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: product_options_helper.php 14702 2011-10-26 11:43:10Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -69,20 +69,30 @@
 
 		function OptionsSalt($options, $comb_only=false)
 		{
-			if (!is_array($options)) return 0;
-			if (!$comb_only) {
+			if ( !is_array($options) ) {
+				return 0;
+			}
+			if ( !$comb_only ) {
 				ksort($options);
 				return crc32(serialize($options));
 			}
 
 			$option_keys = array_keys($options);
-			if (!$option_keys) return ;
-			$included = $this->Conn->GetCol('SELECT ProductOptionId FROM '.TABLE_PREFIX.'ProductOptions WHERE ProductOptionId IN ('.join(',', $option_keys).') AND OptionType IN (1,3,6)');
+			if ( !$option_keys ) {
+				return '';
+			}
+
+			$sql = 'SELECT ProductOptionId
+					FROM ' . TABLE_PREFIX . 'ProductOptions
+					WHERE ProductOptionId IN (' . join(',', $option_keys) . ') AND OptionType IN (1,3,6)';
+			$included = $this->Conn->GetCol($sql);
+
 			foreach ($option_keys as $key) {
-				if (!in_array($key, $included)) {
+				if ( !in_array($key, $included) ) {
 					unset($options[$key]);
 				}
 			}
+
 			return $this->OptionsSalt($options);
 		}
 	}
\ No newline at end of file