summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/upgrader.php
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2011-01-31 20:49:25 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2011-01-31 20:49:25 +0000
commitde6f3fce9110b777d61dec97f2a3a61d887a5ccd (patch)
tree1a184dc0d6bbfd644164d85d3df1bc9926455da7 /modules/gallery/controllers/upgrader.php
parent2898fe3b82ce10d045dd2c274a3290bacf209a00 (diff)
parentd2c77fd0590501f7b6b51d9f4cc033ed9485b082 (diff)
Did a git pull, but had to manually merge a conflict.
Diffstat (limited to 'modules/gallery/controllers/upgrader.php')
-rw-r--r--modules/gallery/controllers/upgrader.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index 66c71648..365ba28e 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -1,7 +1,7 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -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_checker");
+
if (php_sapi_name() == "cli") {
if ($failed) {
print "Upgrade completed ** WITH FAILURES **\n";