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.
---
framework/Web/Javascripts/TJavaScript.php | 10 ----------
1 file changed, 10 deletions(-)
(limited to 'framework')
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