Index: branches/5.2.x/units/product_options/product_options_tag_processor.php
===================================================================
diff -u -N -r15156 -r15312
--- branches/5.2.x/units/product_options/product_options_tag_processor.php	(.../product_options_tag_processor.php)	(revision 15156)
+++ branches/5.2.x/units/product_options/product_options_tag_processor.php	(.../product_options_tag_processor.php)	(revision 15312)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_options_tag_processor.php 15156 2012-03-04 09:27:14Z alex $
+* @version	$Id: product_options_tag_processor.php 15312 2012-04-20 12:29:52Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -108,7 +108,7 @@
 					$selected = is_array($option_value) && in_array(htmlspecialchars($val), $option_value);
 				}
 				else { // radio buttons ?
-					$selected = kUtil::unhtmlentities($option_value) == $val;
+					$selected = htmlspecialchars_decode($option_value) == $val;
 				}
 			}
 
Index: branches/5.2.x/units/order_items/order_items_tag_processor.php
===================================================================
diff -u -N -r15156 -r15312
--- branches/5.2.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 15156)
+++ branches/5.2.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 15312)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_tag_processor.php 15156 2012-03-04 09:27:14Z alex $
+* @version	$Id: order_items_tag_processor.php 15312 2012-04-20 12:29:52Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -78,7 +78,7 @@
 		$options = $item_data['Options'];
 		foreach ($options as $opt => $val) {
 			if ( !is_array($val) ) {
-				$val = kUtil::unhtmlentities($val);
+				$val = htmlspecialchars_decode($val);
 			}
 			$key_data = $opt_helper->ConvertKey($opt, $object->GetDBField('ProductId'));
 
@@ -175,7 +175,7 @@
 		$i = 0;
 		foreach ($values as $val) {
 			$i++;
-			$val = kUtil::unhtmlentities($val);
+			$val = htmlspecialchars_decode($val);
 			$block_params['value'] = htmlspecialchars($val);
 			if ($price_types[$val] == '$') {
 				$iso = $this->GetISO($params['currency']);
Index: branches/5.2.x/units/orders/order_calculator.php
===================================================================
diff -u -N -r15141 -r15312
--- branches/5.2.x/units/orders/order_calculator.php	(.../order_calculator.php)	(revision 15141)
+++ branches/5.2.x/units/orders/order_calculator.php	(.../order_calculator.php)	(revision 15312)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version   $Id: order_calculator.php 15141 2012-03-04 08:08:18Z alex $
+* @version   $Id: order_calculator.php 15312 2012-04-20 12:29:52Z alex $
 * @package   In-Commerce
 * @copyright   Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license   Commercial License
@@ -576,7 +576,7 @@
 
 		protected function formatPrice($a_val, $price, $parsed)
 		{
-			$a_val = kUtil::unhtmlentities($a_val);
+			$a_val = htmlspecialchars_decode($a_val);
 
 			$addition = 0;
 			$conv_prices = $parsed['Prices'];