From 3584856afcf9f745d09dcd56b63932c8bf0716d1 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 28 Jan 2010 21:32:50 -0800 Subject: [PATCH] Use auth::login() when we initially log in the admin user. --- modules/gallery/helpers/identity.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php index ef93d72fec..6df860d655 100644 --- a/modules/gallery/helpers/identity.php +++ b/modules/gallery/helpers/identity.php @@ -68,9 +68,7 @@ static function load_user() { // upconvert into a user. // @todo set the user name into the session instead of 2 and then use it to get the user object if ($user === 2) { - $user = IdentityProvider::instance()->admin_user(); - self::set_active_user($user); - $session->set("user", $user); + auth::login(IdentityProvider::instance()->admin_user()); } if (!$session->get("group_ids")) { @@ -82,7 +80,7 @@ static function load_user() { } } catch (Exception $e) { // Log it, so we at least have so notification that we swallowed the exception. - Kohana_Log::add("error", "Load_user Exception: " . + Kohana_Log::add("error", "load_user Exception: " . $e->getMessage() . "\n" . $e->getTraceAsString()); try { Session::instance()->destroy();