diff options
| -rw-r--r-- | modules/gallery/controllers/admin_identity.php | 11 | ||||
| -rw-r--r-- | modules/user/helpers/user_installer.php | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/modules/gallery/controllers/admin_identity.php b/modules/gallery/controllers/admin_identity.php index 0521a0f8..dcc3edcb 100644 --- a/modules/gallery/controllers/admin_identity.php +++ b/modules/gallery/controllers/admin_identity.php @@ -50,12 +50,6 @@ class Admin_Identity_Controller extends Admin_Controller { module::deactivate($active_provider); module::uninstall($active_provider); - try { - Session::instance()->destroy(); - } catch (Exception $e) { - // We don't care if there was a problem destroying the session. - } - // Switch authentication identity::reset(); module::set_var("gallery", "identity_provider", $new_provider); @@ -67,6 +61,11 @@ class Admin_Identity_Controller extends Admin_Controller { message::success(t("Changed to %description", array("description" => $providers->$new_provider))); + try { + Session::instance()->destroy(); + } catch (Exception $e) { + // We don't care if there was a problem destroying the session. + } url::redirect(item::root()->abs_url()); } diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php index 36c617a8..520f580c 100644 --- a/modules/user/helpers/user_installer.php +++ b/modules/user/helpers/user_installer.php @@ -79,7 +79,6 @@ class user_installer { access::allow($registered, "view", $root); access::allow($registered, "view_full", $root); - user::activate(); module::set_var("gallery", "identity_provider", "user"); module::set_version("user", 1); } |