From 0fe16971665d11ebc57267938a7a4e4bf6762a78 Mon Sep 17 00:00:00 2001
From: "Christophe.Boulain" <>
Date: Wed, 4 Mar 2009 09:57:20 +0000
Subject: Reverting changes of revision 2612, since this introduced a new bug.

---
 HISTORY                                   |  1 -
 framework/Web/Javascripts/TJavaScript.php | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/HISTORY b/HISTORY
index aa7105ad..905d29f7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,7 +4,6 @@ BUG: Issue#87 - TinyMCE : empty string disapears after encoding JS, that's a pro
 BUG: Issue#96 - THttpResponse::redirect don't send status code (Christophe)
 BUG: Issue#107 - typo in TDbConnection::getCharset() (Christophe)
 CHG: Issue#7 - Clients Scripts are not combined anymore in Debug application mode (Christophe)
-ENH: Issue#106 - TJavaScript::jsonEncode and TJavaScript::jsonDecode should use built-in PHP functions (Christophe)
 ENH: Issue#115 - Registry for Prado generated clientside counterparts of serverside controls (Yves Berkholz)
 ENH: Added caching of message files to TException (Michael)
 ENH: Updated to scriptaculous 1.8.2 & Prototype 1.6.0.3
diff --git a/framework/Web/Javascripts/TJavaScript.php b/framework/Web/Javascripts/TJavaScript.php
index b36d5b40..2134c2d1 100644
--- a/framework/Web/Javascripts/TJavaScript.php
+++ b/framework/Web/Javascripts/TJavaScript.php
@@ -210,14 +210,6 @@ class TJavaScript
 	 */
 	public static function jsonEncode($value)
 	{
-		if (function_exists('json_encode'))
-		{
-			if (is_string($value) && 
-				($g=Prado::getApplication()->getGlobalization(false))!==null && 
-				strtoupper($enc=$g->getCharset())!='UTF-8')
-				$value=iconv($enc, 'UTF-8', $value);
-			return json_encode($value);
-		}
 		if(self::$_json === null)
 			self::$_json = Prado::createComponent('System.Web.Javascripts.TJSON');
 		return self::$_json->encode($value);
@@ -231,8 +223,6 @@ class TJavaScript
 	 */
 	public static function jsonDecode($value)
 	{
-		if (function_exists('json_decode'))
-			return json_decode($value);
 		if(self::$_json === null)
 			self::$_json = Prado::createComponent('System.Web.Javascripts.TJSON');
 		return self::$_json->decode($value);
-- 
cgit v1.2.3