Index: branches/5.2.x/units/orders/order_calculator.php
===================================================================
diff -u -N -r15312 -r16025
--- branches/5.2.x/units/orders/order_calculator.php	(.../order_calculator.php)	(revision 15312)
+++ branches/5.2.x/units/orders/order_calculator.php	(.../order_calculator.php)	(revision 16025)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version   $Id: order_calculator.php 15312 2012-04-20 12:29:52Z alex $
+* @version   $Id: order_calculator.php 16025 2014-04-29 13:00:26Z 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 = htmlspecialchars_decode($a_val);
+			$a_val = kUtil::unescape($a_val, kUtil::ESCAPE_HTML); // TODO: Not sure why we're unescaping.
 
 			$addition = 0;
 			$conv_prices = $parsed['Prices'];
@@ -856,4 +856,4 @@
 		{
 			return $this->manager->getTable($prefix);
 		}
-	}
\ No newline at end of file
+	}
Index: branches/5.2.x/units/product_options/product_options_tag_processor.php
===================================================================
diff -u -N -r15854 -r16025
--- branches/5.2.x/units/product_options/product_options_tag_processor.php	(.../product_options_tag_processor.php)	(revision 15854)
+++ branches/5.2.x/units/product_options/product_options_tag_processor.php	(.../product_options_tag_processor.php)	(revision 16025)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: product_options_tag_processor.php 15854 2013-07-02 14:55:29Z alex $
+* @version	$Id: product_options_tag_processor.php 16025 2014-04-29 13:00:26Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -108,7 +108,8 @@
 					$selected = is_array($option_value) && in_array(kUtil::escape($val), $option_value);
 				}
 				else { // radio buttons ?
-					$selected = htmlspecialchars_decode($option_value) == $val;
+					// TODO: Not sure why we're unescaping.
+					$selected = kUtil::unescape($option_value, kUtil::ESCAPE_HTML) == $val;
 				}
 			}
 
@@ -172,4 +173,4 @@
 	{
 		return $this->PrintList2($params);
 	}
-}
\ No newline at end of file
+}
Index: branches/5.2.x/units/order_items/order_items_tag_processor.php
===================================================================
diff -u -N -r15854 -r16025
--- branches/5.2.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 15854)
+++ branches/5.2.x/units/order_items/order_items_tag_processor.php	(.../order_items_tag_processor.php)	(revision 16025)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: order_items_tag_processor.php 15854 2013-07-02 14:55:29Z alex $
+* @version	$Id: order_items_tag_processor.php 16025 2014-04-29 13:00:26Z 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 = htmlspecialchars_decode($val);
+				$val = kUtil::unescape($val, kUtil::ESCAPE_HTML); // TODO: Not sure why we're unescaping.
 			}
 			$key_data = $opt_helper->ConvertKey($opt, $object->GetDBField('ProductId'));
 
@@ -177,7 +177,7 @@
 		$i = 0;
 		foreach ($values as $val) {
 			$i++;
-			$val = htmlspecialchars_decode($val);
+			$val = kUtil::unescape($val, kUtil::ESCAPE_HTML); // TODO: Not sure why we're unescaping.
 
 			// TODO: consider escaping in template instead
 			$block_params['value'] = kUtil::escape($val);
@@ -302,4 +302,4 @@
 
 		return $order_helper->eligibleForFreePromoShipping($object);
 	}
-}
\ No newline at end of file
+}