projects / Pman.Core / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 859da19)
JsonOutputTrait.php
authorAlan <alan@roojs.com>
Thu, 29 Feb 2024 04:57:55 +0000 (12:57 +0800)
committerAlan <alan@roojs.com>
Thu, 29 Feb 2024 04:57:55 +0000 (12:57 +0800)
JsonOutputTrait.php patch | blob | history

diff --git a/JsonOutputTrait.php b/JsonOutputTrait.php
index 6813ad2..2f18626 100644 (file)
--- a/JsonOutputTrait.php
+++ b/JsonOutputTrait.php
@@ -9,13 +9,10 @@ trait Pman_Core_JsonOutputTrait {
         }
         
         $cli = HTML_FlexyFramework::get()->cli;
-        
         if ($cli) {
             echo "OK: " .$str . "\n";
             exit;
         }
-        require_once 'Services/JSON.php';
-        $json = new Services_JSON();
         
         $retHTML = isset($_SERVER['CONTENT_TYPE']) && 
                 preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']);
@@ -33,15 +30,16 @@ trait Pman_Core_JsonOutputTrait {
             echo "<HTML><HEAD></HEAD><BODY>";
             // encode html characters so they can be read..
             echo  str_replace(array('<','>'), array('\u003c','\u003e'),
-                        $json->encodeUnsafe(array('success'=> true, 'data' => $str)));
+                        $this->jsencode(array('success'=> true, 'data' => $str), false));
             echo "</BODY></HTML>";
             exit;
         }
         
         
-        echo  $json->encode(array('success'=> true, 'data' => $str));
+        echo  $this->jsencode(array('success'=> true, 'data' => $str),true);
         
         exit;
+        
     }
     
     
Pman Core