Index: branches/5.2.x/units/helpers/post_helper.php
===================================================================
diff -u -N -r15604 -r16024
--- branches/5.2.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 15604)
+++ branches/5.2.x/units/helpers/post_helper.php	(.../post_helper.php)	(revision 16024)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: post_helper.php 15604 2012-11-06 17:13:47Z alex $
+* @version	$Id: post_helper.php 16024 2014-04-29 13:00:17Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -397,6 +397,7 @@
 		 * @param string $input_string code line to highlight
 		 * @param string $bbcode_element block name used for bbcode descoration
 		 * @return string
+		 * @see    parsePostBody about why we unescape here.
 		 */
 		function replaceCodeBBCode($input_string, $bbcode_element)
 		{
@@ -407,7 +408,7 @@
 				$bbcode_mask = trim($this->Application->ParseBlock($block_params));
 			}
 
-			$input_string = trim( str_replace('\"','"', htmlspecialchars_decode($input_string)) );
+			$input_string = trim(str_replace('\"', '"', kUtil::unescape($input_string, kUtil::ESCAPE_HTML)));
 			$input_string = $this->highlightCode($input_string);
 			$input_string = preg_replace("/\r<br \/>/s", "\r", $input_string); // undo nl2br added in highlighting
 			$input_string = str_replace('#BB_CODE#', $input_string, $bbcode_mask);
@@ -460,4 +461,4 @@
 
 			return $manager;
 		}
-	}
\ No newline at end of file
+	}