2 files changed, 8 insertions, 0 deletions
diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index f5af9a5a..650b7e9e 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -95,12 +95,17 @@ class Admin_Modules_Controller extends Admin_Controller {
           $activated_names[] = t($info->name);
         }
       } catch (Exception $e) {
+        message::warning(t("An error occurred while installing the <b>%module_name</b> module",
+                           array("module_name" => $info->name)));
         Kohana_Log::add("error", (string)$e);
       }
     }
 
     module::event("module_change", $changes);
 
+    // If modules need upgrading, this will get recreated
+    site_status::clear("upgrade_now");
+
     // @todo this type of collation is questionable from an i18n perspective
     if ($activated_names) {
       message::success(t("Activated: %names", array("names" => join(", ", $activated_names))));
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index a3cfac48..6613d671 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -83,6 +83,9 @@ class Upgrader_Controller extends Controller {
       }
     }
 
+    // If the upgrade failed, this will get recreated
+    site_status::clear("upgrade_now");
+
     if (php_sapi_name() == "cli") {
       print "Upgrade complete\n";
     } else {