Index: branches/5.3.x/units/product_options/product_options_tag_processor.php
===================================================================
diff -u -N -r15671 -r15899
--- branches/5.3.x/units/product_options/product_options_tag_processor.php	(.../product_options_tag_processor.php)	(revision 15671)
+++ branches/5.3.x/units/product_options/product_options_tag_processor.php	(.../product_options_tag_processor.php)	(revision 15899)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_options_tag_processor.php 15671 2013-01-17 11:39:41Z alex $
+* @version	$Id: product_options_tag_processor.php 15899 2013-07-12 10:32:25Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -60,12 +60,12 @@
 			$val = $option;
 
 			if ( getArrayValue($params, 'js') ) {
-				$block_params['id'] = addslashes($val);
-				$block_params['value'] = htmlspecialchars($val, null, CHARSET);
+				$block_params['id'] = kUtil::escape($val, kUtil::ESCAPE_JS);
+				$block_params['value'] = kUtil::escape($val);
 			}
 			else {
-				$block_params['id'] = htmlspecialchars($val, null, CHARSET);
-				$block_params['value'] = htmlspecialchars($val, null, CHARSET);
+				$block_params['id'] = kUtil::escape($val);
+				$block_params['value'] = kUtil::escape($val);
 			}
 
 			if ( $conv_prices[$val] ) {
@@ -105,7 +105,7 @@
 				$option_value = array_key_exists($object->GetID(), $options) ? $options[$object->GetID()] : '';
 
 				if ( $object->GetDBField('OptionType') == OptionType::CHECKBOX ) {
-					$selected = is_array($option_value) && in_array(htmlspecialchars($val, null, CHARSET), $option_value);
+					$selected = is_array($option_value) && in_array(kUtil::escape($val), $option_value);
 				}
 				else { // radio buttons ?
 					$selected = htmlspecialchars_decode($option_value) == $val;