summaryrefslogtreecommitdiff
path: root/framework/Web/Javascripts/TJSON.php
diff options
context:
space:
mode:
authorctrlaltca@gmail.com <>2012-01-25 08:33:05 +0000
committerctrlaltca@gmail.com <>2012-01-25 08:33:05 +0000
commitd7f166a39fba8f75323f86c690e80950c3a87f97 (patch)
tree0f69b9ff508819a0eafa2c1638618f1fcd541b49 /framework/Web/Javascripts/TJSON.php
parent6c18f7df16d1f5bdf64fd615165dcb8a8a42e204 (diff)
patched #379
Diffstat (limited to 'framework/Web/Javascripts/TJSON.php')
-rw-r--r--framework/Web/Javascripts/TJSON.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/framework/Web/Javascripts/TJSON.php b/framework/Web/Javascripts/TJSON.php
index e0d31b05..0b119a99 100644
--- a/framework/Web/Javascripts/TJSON.php
+++ b/framework/Web/Javascripts/TJSON.php
@@ -143,7 +143,11 @@ class TJSON
case 'double':
case 'float':
- return (float) $var;
+ $locale=localeConv();
+ if($locale['decimal_point']=='.')
+ return (float) $var;
+ else
+ return str_replace($locale['decimal_point'], '.', (float)$var);
case 'string':
if (($g=Prado::getApplication()->getGlobalization(false))!==null &&