summaryrefslogtreecommitdiff
path: root/modules/rest/controllers/rest.php
diff options
context:
space:
mode:
Diffstat (limited to 'modules/rest/controllers/rest.php')
-rw-r--r--modules/rest/controllers/rest.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 3e364bff..ccccc762 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -34,8 +34,7 @@ class Rest_Controller extends Controller {
auth::login($user);
- $key = rest::get_access_key($user->id);
- rest::reply($key->access_key);
+ rest::reply(rest::access_key());
}
public function __call($function, $args) {
@@ -91,7 +90,7 @@ class Rest_Controller extends Controller {
private function _format_exception_response($e) {
// Add this exception to the log
- Kohana_Log::add('error', Kohana_Exception::text($e));
+ Kohana_Log::add("error", Kohana_Exception::text($e));
$rest_exception = array();
if ($e instanceof ORM_Validation_Exception) {