diff -u plugin.php plugin.php --- plugin.php 12 Oct 2009 05:08:34 -0000 +++ plugin.php 12 Oct 2009 20:04:33 -0000 @@ -121,6 +121,10 @@ if ($results['success']) { variable_set('site_offline', FALSE); drupal_set_message(t("Update was completed successfully! Your site has been taken out of maintenance mode.")); + // If we updated, clear our cache of computed update status and + // available release data so we refetch and recompute status to prevent + // showing any bogus results. + _update_cache_clear(); } else { drupal_set_message(t("Update failed! See the log below for more information. Your site is still in maintenance mode"), 'error'); reverted: --- modules/update/update.fetch.inc 12 Oct 2009 05:08:34 -0000 +++ modules/update/update.fetch.inc 5 Oct 2009 01:24:37 -0000 1.23 @@ -46,7 +46,7 @@ // to clear out the stale data at this point. _update_cache_clear('update_available_releases'); + $max_fetch_attempts = variable_get('update_max_fetch_attempts', UPDATE_MAX_FETCH_ATTEMPTS); - $max_fetch_attempts = variable_get('update_max_fetch_attempts', UPDATE_MAX_FETCH_ATTEMPTS); foreach ($projects as $key => $project) { $url = _update_build_fetch_url($project, $site_key); diff -u modules/update/update.js modules/update/update.js --- modules/update/update.js 12 Oct 2009 05:08:34 -0000 +++ modules/update/update.js 12 Oct 2009 20:15:49 -0000 @@ -1,4 +1,11 @@ // $Id$ + +/** + * @file + * Conditionally hide or show the appropriate settings and saved defaults + * on the file transfer connection settings form. + */ + (function ($) { Drupal.behaviors.updateFileTransferForm = { @@ -11,15 +18,15 @@ // Hide any major version warnings, make a jquery UI dialog when checked. $('.update-major-version-warning').each(function (elem) { - that = $(this); + self = $(this); $(this).hide(); $(":checkbox", $(this).parent().parent()).bind('change', function(e) { if (this.checked) { - that.dialog("open"); + self.dialog("open"); var buttons = {} buttons[Drupal.t("Ok")] = function() { $(this).dialog("close"); }; buttons[Drupal.t("Cancel")] = function() { alert('cancel'); $(this).dialog("close"); }; - that.dialog({'buttons': buttons}); + self.dialog({'buttons': buttons}); } }); });