summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-01-28 21:33:41 -0800
committerBharat Mediratta <bharat@menalto.com>2010-01-28 21:33:41 -0800
commit9908f37eef22db81061eef7783d4d7fd11ccaf3b (patch)
tree3793e5cb55c5884357e73d8af77b202325065e89
parent70b235e13d3b8ba12977c1699eb108e35a73f069 (diff)
Use identity::set_active_user() instead of auth::login() when we
change providers otherwise the user_installer code is going to be calling auth::login() which causes all kinds of unexpected weirdness, like it triggers the handler in gallery_event which detects graphics toolkits, and that's only supposed to run on the first admin login.
-rw-r--r--modules/gallery/libraries/IdentityProvider.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index c6b393ec..3f1666eb 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -83,7 +83,7 @@ class IdentityProvider_Core {
module::event("identity_provider_changed", $current_provider, $new_provider);
- auth::login($provider->admin_user());
+ identity::set_active_user($provider->admin_user());
Session::instance()->regenerate();
} catch (Exception $e) {
static $restore_already_running;