[Fmsystem-commits] [9119] JSON Serializer ok

[Sigurd Nes]

Revision: 9119
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9119
Author:   sigurdne
Date:     2012-04-11 07:30:44 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
JSON Serializer ok

Modified Paths:
--------------
    trunk/index.php

Modified: trunk/index.php
===================================================================
--- trunk/index.php     2012-04-11 07:09:53 UTC (rev 9118)
+++ trunk/index.php     2012-04-11 07:30:44 UTC (rev 9119)
@@ -109,16 +109,7 @@
                        // comply with RFC 4627
                        header('Content-Type: application/json'); 
                        $return_data = $GLOBALS[$class]->$method();
-                       /*
-                       * JSON Serializer produces invalid JSON if a value ends 
with quote
-                       */
-                       $v = json_encode($return_data);
-                       if(preg_match('/^"(.*)"$/', $v, $matches))
-                       {
-                       $v = $matches[1];
-               }
-                       echo $v;
-//                     echo json_encode($return_data);
+                       echo json_encode($return_data);
                        $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
 
                        //If debug info is not triggered elsewhere.