3 files changed, 5 insertions, 6 deletions
diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php
index dcc3edcb..520b1966 100644
--- a/modules/gallery/controllers/admin_identity.php
+++ b/modules/gallery/controllers/admin_identity.php
@@ -45,7 +45,7 @@ class Admin_Identity_Controller extends Admin_Controller {
 
     if ($new_provider != $active_provider) {
 
-      module::event("pre_identity_change", $active_provider, $new_provider);
+      module::event("identity_before_change", $active_provider, $new_provider);
 
       module::deactivate($active_provider);
       module::uninstall($active_provider);
@@ -57,7 +57,6 @@ class Admin_Identity_Controller extends Admin_Controller {
       module::install($new_provider);
       module::activate($new_provider);
 
-      // @todo this type of collation is questionable from an i18n perspective
       message::success(t("Changed to %description",
                          array("description" => $providers->$new_provider)));
 
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 24ceb0c9..d393422e 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -29,7 +29,7 @@ class Albums_Controller extends Items_Controller {
         $view = new Theme_View("page.html", "login");
         $view->page_title = t("Log in to Gallery");
         $view->content = new View("login_ajax.html");
-        $view->content->form = login::get_login_form("login/auth_html");
+        $view->content->form = login::get_form("login/auth_html");
         print $view;
         return;
       } else {
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index 86e2b0a4..720e6375 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -21,7 +21,7 @@ class Login_Controller extends Controller {
 
   public function ajax() {
     $view = new View("login_ajax.html");
-    $view->form = login::get_login_form("login/auth_ajax");
+    $view->form = login::get_form("login/auth_ajax");
     print $view;
   }
 
@@ -40,7 +40,7 @@ class Login_Controller extends Controller {
   }
 
   public function html() {
-    print login::get_login_form("login/auth_html");
+    print login::get_form("login/auth_html");
   }
 
   public function auth_html() {
@@ -55,7 +55,7 @@ class Login_Controller extends Controller {
   }
 
   private function _auth($url) {
-    $form = login::get_login_form($url);
+    $form = login::get_form($url);
     $valid = $form->validate();
     if ($valid) {
       $user = identity::lookup_user_by_name($form->login->inputs["name"]->value);