summaryrefslogtreecommitdiff
path: root/modules/rest/helpers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-03-30 14:01:40 -0700
committerBharat Mediratta <bharat@menalto.com>2010-03-30 14:01:40 -0700
commitca977dce516b9e2ca9539db69fce188ed33d971c (patch)
tree5faafbb0ca4ff8ebe9260382bbf29fda9a8efe85 /modules/rest/helpers
parent59b6cd30e621ffeba55f23012e3ede42a4905e78 (diff)
Rename "access_token" to "access_key" in the code for consistency.
Diffstat (limited to 'modules/rest/helpers')
-rw-r--r--modules/rest/helpers/rest.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index e87ee91c..49999520 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -37,13 +37,13 @@ class rest_Core {
}
}
- static function set_active_user($access_token) {
- if (empty($access_token)) {
+ static function set_active_user($access_key) {
+ if (empty($access_key)) {
throw new Rest_Exception("Forbidden", 403);
}
$key = ORM::factory("user_access_key")
- ->where("access_key", "=", $access_token)
+ ->where("access_key", "=", $access_key)
->find();
if (!$key->loaded()) {
@@ -58,7 +58,7 @@ class rest_Core {
identity::set_active_user($user);
}
- static function get_access_token($user_id) {
+ static function get_access_key($user_id) {
$key = ORM::factory("user_access_key")
->where("user_id", "=", $user_id)
->find();