fixes #2534 (I think)...output looked ok with de_DE.UTF-8

git-svn-id: http://dev.piwik.org/svn/trunk@4967 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 11 insertions, 1 deletions

diff --git a/libs/upgradephp/upgrade.php b/libs/upgradephp/upgrade.php
index c6dee9fe62..90677cf8c8 100644
--- a/libs/upgradephp/upgrade.php
+++ b/libs/upgradephp/upgrade.php
@@ -109,6 +109,9 @@ if(!defined('E_USER_DEPRECATED')) {   define('E_USER_DEPRECATED', 16384); }
 if (!function_exists("json_encode")) {
    function json_encode($var, /*emu_args*/$obj=FALSE) {
    
+      #-- handle locale differences
+      $locale = localeconv();
+
       #-- prepare JSON string
       $json = "";
       
@@ -154,9 +157,16 @@ if (!function_exists("json_encode")) {
       elseif ($var === NULL) {
          $json = "null";
       }
-      elseif (is_int($var) || is_float($var)) {
+      elseif (is_int($var)) {
          $json = "$var";
       }
+      elseif (is_float($var)) {
+         $json = str_replace(
+            array($locale['mon_thousands_sep'], $locale['mon_decimal_point']),
+            array('', '.'),
+            $var
+         );
+      }
 
       #-- something went wrong
       else {