summaryrefslogtreecommitdiff
path: root/modules/gallery
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-01-17 20:03:11 -0800
committerBharat Mediratta <bharat@menalto.com>2011-01-17 20:03:11 -0800
commit45caba09f81e53dfa4264bc74c4e6ed7935bd5f9 (patch)
tree71b7f4493af232921f580a20bd554f670c3682df /modules/gallery
parent2b190c055922bbf37620bc104a6e06f3dd6f2b82 (diff)
Move the code that clears the upgrade_check site status message to the
upgrader so that it's cleared any time we run an upgrade. Part of
Diffstat (limited to 'modules/gallery')
-rw-r--r--modules/gallery/controllers/upgrader.php3
-rw-r--r--modules/gallery/helpers/gallery_installer.php3
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index 66c71648..0932090f 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -94,6 +94,9 @@ class Upgrader_Controller extends Controller {
// If the upgrade failed, this will get recreated
site_status::clear("upgrade_now");
+ // Clear any upgrade check strings, we are probably up to date.
+ site_status::clear("upgrade_check");
+
if (php_sapi_name() == "cli") {
if ($failed) {
print "Upgrade completed ** WITH FAILURES **\n";
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 41ed1c6e..1ffe9bae 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -677,9 +677,6 @@ class gallery_installer {
module::set_var("gallery", "upgrade_checker_auto_enabled", true);
module::set_version("gallery", $version = 46);
}
-
- // Clear any upgrade check strings, we are probably up to date.
- site_status::clear("upgrade_check");
}
static function uninstall() {