From 923a322ef57fec97fdf5cbb2a0fd5efd67668911 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Fri, 23 Oct 2009 06:09:24 -0700 Subject: Change the Admin_Identity_Controller to not destroy the session until after the new provider is installed. --- modules/gallery/controllers/admin_identity.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'modules/gallery/controllers') 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()); } -- cgit v1.2.3