Merge branch 'devel' into helpandotherthings

2024-12-06 19:36:21 +01:00 · 2016-11-25 11:15:27 +01:00
parent 5f34f6cac3 f251b5e648
commit 0b329021dc
1 changed files with 9 additions and 1 deletions
@@ -77,5 +77,13 @@
    }

    $data = filterArray($data);
-    echo json_encode($data);
+
+    if(isset($_GET["jsonForceObject"]))
+    {
+        echo json_encode($data, JSON_FORCE_OBJECT);
+    }
+    else
+    {
+        echo json_encode($data);
+    }
 ?>