output error if json_encode fails

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 8420bfb51ea53cd12395d567514d9129fdb70d94..24f42e4a4103d55e97709eb9f55c975294f80333 100644 (file)
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -771,9 +771,15 @@ class ApiAction extends Action
 
     function showJsonObjects($objects)
     {
-        print(json_encode($objects));
+        $json_objects = json_encode($objects);
+        if($json_objects === false) {
+            $this->clientError(_('JSON encoding failed. Error: ').json_last_error_msg());                 
+        } else {
+               print $json_objects;
+        }
     }
 
+
     function showSingleXmlStatus($notice)
     {
         $this->initDocument('xml');
@@ -1558,4 +1564,4 @@ class ApiAction extends Action
 
         return $uri;
     }
-}
+}
\ No newline at end of file