From dcba664f74439e37cc269df0cf549a2fee552aeb Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 29 Jan 2010 20:37:48 -0800
Subject: Use ? or & as appropriate when appending output=html.

---
 modules/rest/helpers/rest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'modules/rest/helpers')

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;
   }
-- 
cgit v1.2.3