diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-18 21:49:26 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-06-18 21:49:26 -0700 |
| commit | 239da247863fb1cb5511ea557cf84dd780071be5 (patch) | |
| tree | a603a16540702c37eecad4031597568b0bbaa19c /modules/rest/controllers/rest.php | |
| parent | e40b2371ee4cc2756d80b36042124c71f21bc353 (diff) | |
| parent | 9b788674275c843947d44934a50dd395b515737a (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/rest/controllers/rest.php')
| -rw-r--r-- | modules/rest/controllers/rest.php | 5 |
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) { |