1 files changed, 5 insertions, 1 deletions
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 1f95a7e7..3883794a 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -113,7 +113,11 @@ class rest_Core {
 
     $url = call_user_func_array(array($class, "url"), $args);
     if (Input::instance()->get("output") == "html") {
-      $url .= "?output=html";
+      if (strpos($url, "?") === false) {
+        $url .= "?output=html";
+      } else {
+        $url .= "&output=html";
+      }
     }
     return $url;
   }