Move the first-admin-login steps out of the user module and into an event listener in core

2 files changed, 9 insertions, 7 deletions

diff --git a/core/helpers/core_event.php b/core/helpers/core_event.php
index 5f13959a..c9e4e743 100644
--- a/core/helpers/core_event.php
+++ b/core/helpers/core_event.php
@@ -59,4 +59,13 @@ class core_event_Core {
       $event_parms->panes[] = array("label" => t("Sort Order"),  "content" => $sortPane);
     }
   }
+
+  static function user_login($user) {
+    // If this user is an admin, check to see if there are any post-install tasks that we need
+    // to run and take care of those now.
+    if ($user->admin && module::get_var("core", "choose_default_tookit", null)) {
+      graphics::choose_default_toolkit();
+      module::clear_var("core", "choose_default_tookit");
+    }
+  }
 }
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index 1e2e2f2f..7853f725 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -67,13 +67,6 @@ class Login_Controller extends Controller {
     if ($valid) {
       user::login($user);
       log::info("user", t("User %name logged in", array("name" => $user->name)));
-
-      // If this user is an admin, check to see if there are any post-install tasks that we need
-      // to run and take care of those now.
-      if ($user->admin && module::get_var("core", "choose_default_tookit", null)) {
-        graphics::choose_default_toolkit();
-        module::clear_var("core", "choose_default_tookit");
-      }
     }
 
     return array($valid, $form);