diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-29 20:37:48 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-29 20:37:48 -0800 |
| commit | dcba664f74439e37cc269df0cf549a2fee552aeb (patch) | |
| tree | a37df8c573d8b0b625c634dea025a609768e740d /modules/rest/helpers | |
| parent | a04d0d278964c93b4829ec2e77f5f315abcba392 (diff) | |
Use ? or & as appropriate when appending output=html.
Diffstat (limited to 'modules/rest/helpers')
| -rw-r--r-- | modules/rest/helpers/rest.php | 6 |
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; } |