From: Alan Knowles <alan@roojs.com>
Date: Tue, 19 May 2020 07:35:04 +0000 (+0800)
Subject: if json_encode fails - failback to php version
X-Git-Url: http://git.roojs.org/?p=Pman.Base;a=commitdiff_plain;h=72403a5d68f9d8f1bb6e942e66bd752cf1ecbb14

if json_encode fails - failback to php version
---

diff --git a/Pman.php b/Pman.php
index d387018..4a8acec 100644
--- a/Pman.php
+++ b/Pman.php
@@ -357,7 +357,10 @@ class Pman extends HTML_FlexyFramework_Page
             header("Content-type: text/javascript");
         }
         if (function_exists("json_encode")) {
-            return json_encode($v);
+            $ret=  json_encode($v);
+            if ($ret !== false) {
+                return $ret;
+            }
         }
         require_once 'Services/JSON.php';
         $js = new Services_JSON();
@@ -661,6 +664,7 @@ class Pman extends HTML_FlexyFramework_Page
             }
             file_put_contents($fn, $ret);
         }
+        
         echo $ret;
         exit;
     }