Index: branches/5.2.x/units/product_options/product_options_tag_processor.php
===================================================================
diff -u -N -r15312 -r15600
--- branches/5.2.x/units/product_options/product_options_tag_processor.php	(.../product_options_tag_processor.php)	(revision 15312)
+++ branches/5.2.x/units/product_options/product_options_tag_processor.php	(.../product_options_tag_processor.php)	(revision 15600)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_options_tag_processor.php 15312 2012-04-20 12:29:52Z alex $
+* @version	$Id: product_options_tag_processor.php 15600 2012-11-02 14:17:28Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -61,11 +61,11 @@
 
 			if ( getArrayValue($params, 'js') ) {
 				$block_params['id'] = addslashes($val);
-				$block_params['value'] = htmlspecialchars($val);
+				$block_params['value'] = htmlspecialchars($val, null, CHARSET);
 			}
 			else {
-				$block_params['id'] = htmlspecialchars($val);
-				$block_params['value'] = htmlspecialchars($val);
+				$block_params['id'] = htmlspecialchars($val, null, CHARSET);
+				$block_params['value'] = htmlspecialchars($val, null, CHARSET);
 			}
 
 			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), $option_value);
+					$selected = is_array($option_value) && in_array(htmlspecialchars($val, null, CHARSET), $option_value);
 				}
 				else { // radio buttons ?
 					$selected = htmlspecialchars_decode($option_value) == $val;