Merge remote branch 'gallery3/master'

1 files changed, 13 insertions, 7 deletions

diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index 067a9929..5f341c90 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -99,18 +99,24 @@ class IdentityProvider_Core {
         $restore_already_running = true;
 
         // Make sure new provider is not in the database
-        module::uninstall($new_provider);
+        try {
+          module::uninstall($new_provider);
 
-        // Lets reset to the current provider so that the gallery installation is still
-        // working.
-        module::set_var("gallery", "identity_provider", null);
-        IdentityProvider::change_provider($current_provider);
-        module::activate($current_provider);
+          // Lets reset to the current provider so that the gallery installation is still
+          // working.
+          module::set_var("gallery", "identity_provider", null);
+          IdentityProvider::change_provider($current_provider);
+          module::activate($current_provider);
+        } catch (Exception $e2) {
+          Kohana_Log::add("error", "Error restoring original identity provider\n" .
+                          $e2->getMessage() . "\n" . $e2->getTraceAsString());
+        }
+          
         message::error(
           t("Error attempting to enable \"%new_provider\" identity provider, " .
             "reverted to \"%old_provider\" identity provider",
             array("new_provider" => $new_provider, "old_provider" => $current_provider)));
-
+        
         $restore_already_running = false;
       }
       throw $e;