Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 8 insertions, 6 deletions

diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index a61aba2f..1ee72aed 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -21,17 +21,19 @@ class rest_Core {
   static function reply($data=array()) {
     Session::instance()->abort_save();
 
-    if ($data) {
-      if (Input::instance()->get("output") == "html") {
-        header("Content-type: text/html");
+    if (Input::instance()->get("output") == "html") {
+      header("Content-type: text/html");
+      if ($data) {
         $html = preg_replace(
           "#([\w]+?://[\w]+[^ \'\"\n\r\t<]*)#ise", "'<a href=\"\\1\" >\\1</a>'",
           var_export($data, 1));
-        print "<pre>$html</pre>";
       } else {
-        header("Content-type: application/json");
-        print json_encode($data);
+        $html = t("Empty response");
       }
+      print "<pre>$html</pre>";
+    } else {
+      header("Content-type: application/json");
+      print json_encode($data);
     }
   }