Merge commit 'upstream/master'

3 files changed, 6 insertions, 5 deletions

diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 9141d6d4..374ae0d2 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -40,6 +40,7 @@ class Rest_Controller extends Controller {
 
   public function __call($function, $args) {
     $input = Input::instance();
+    $request = new stdClass();
     switch ($method = strtolower($input->server("REQUEST_METHOD"))) {
     case "get":
       $request->params = (object) $input->get();
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index b3f80a55..a61aba2f 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -19,7 +19,7 @@
  */
 class rest_Core {
   static function reply($data=array()) {
-    Session::abort_save();
+    Session::instance()->abort_save();
 
     if ($data) {
       if (Input::instance()->get("output") == "html") {
diff --git a/modules/rest/tests/Rest_Controller_Test.php b/modules/rest/tests/Rest_Controller_Test.php
index 5e624112..9f73bed9 100644
--- a/modules/rest/tests/Rest_Controller_Test.php
+++ b/modules/rest/tests/Rest_Controller_Test.php
@@ -138,8 +138,8 @@ class Rest_Controller_Test extends Gallery_Unit_Test_Case {
 }
 
 class mock_rest {
-  function get($request)    { return $request; }
-  function post($request)   { return $request; }
-  function put($request)    { return $request; }
-  function delete($request) { return $request; }
+  static function get($request)    { return $request; }
+  static function post($request)   { return $request; }
+  static function put($request)    { return $request; }
+  static function delete($request) { return $request; }
 }
\ No newline at end of file