Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 8 insertions, 8 deletions

diff --git a/modules/rest/helpers/rest_event.php b/modules/rest/helpers/rest_event.php
index 91affe7a..e4e53ef6 100644
--- a/modules/rest/helpers/rest_event.php
+++ b/modules/rest/helpers/rest_event.php
@@ -24,7 +24,7 @@ class rest_event {
    */
   static function user_before_delete($user) {
     db::build()
-      ->delete("user_access_tokens")
+      ->delete("user_access_keys")
        ->where("id", "=", $user->id)
        ->execute();
   }
@@ -34,7 +34,7 @@ class rest_event {
    * on every add.
    */
   static function user_add_form_admin_completed($user, $form) {
-    $key = ORM::factory("user_access_token");
+    $key = ORM::factory("user_access_key");
     $key->user_id = $user->id;
     $key->access_key = md5($user->name . rand());
     $key->save();
@@ -58,7 +58,7 @@ class rest_event {
    * Get the form fields for user edit
    */
   static function _get_access_key_form($user, $form) {
-    $key = ORM::factory("user_access_token")
+    $key = ORM::factory("user_access_key")
       ->where("user_id", "=", $user->id)
       ->find();
 
@@ -68,7 +68,7 @@ class rest_event {
       $key->save();
     }
 
-    $form->edit_user->input("user_access_token")
+    $form->edit_user->input("user_access_key")
       ->value($key->access_key)
       ->readonly("readonly")
       ->class("g-form-static")
@@ -87,9 +87,9 @@ class rest_event {
     }
 
     $view = new View("user_profile_rest.html");
-    $key = ORM::factory("user_access_token")
-        ->where("user_id", "=", $data->user->id)
-        ->find();
+    $key = ORM::factory("user_access_key")
+      ->where("user_id", "=", $data->user->id)
+      ->find();
 
     if (!$key->loaded()) {
       $key->user_id = $data->user->id;
@@ -97,6 +97,6 @@ class rest_event {
       $key->save();
     }
     $view->rest_key = $key->access_key;
-    $data->content[] = (object)array("title" => t("Rest api"), "view" => $view);
+    $data->content[] = (object)array("title" => t("REST api"), "view" => $view);
   }
 }