From a0c6d055d1b7259667bebb1b5bf9e2a99c0f8260 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 22 Jan 2010 00:53:44 -0800
Subject: output_type --> output

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

(limited to 'modules/rest/helpers')

diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index fe704a9e..0d2ec9d4 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -22,7 +22,7 @@ class rest_Core {
     Session::abort_save();
 
     if ($data) {
-      if (Input::instance()->get("output_type") == "html") {
+      if (Input::instance()->get("output") == "html") {
         header("Content-type: text/html");
         $html = preg_replace(
           "#(^|[\n ])([\w]+?://[\w]+[^ \"\n\r\t<]*)#ise", "'\\1<a href=\"\\2\" >\\2</a>'",
@@ -112,8 +112,8 @@ class rest_Core {
     }
 
     $url = call_user_func_array(array($class, "url"), $args);
-    if (Input::instance()->get("output_type") == "html") {
-      $url .= "?output_type=html";
+    if (Input::instance()->get("output") == "html") {
+      $url .= "?output=html";
     }
     return $url;
   }
-- 
cgit v1.2.3