Change the Admin_Identity_Controller to not destroy the session until after the new provider is installed.

1 files changed, 5 insertions, 6 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());
     }