diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-06 06:57:40 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-06 06:57:40 +0000 |
| commit | 2c77be1b606bebf638a5b9b9db5914cd68199cc0 (patch) | |
| tree | 2032dc18eb2cf8dea4bb5d29ea932b4393d2e769 | |
| parent | 0369f3f80874c5f61f29f4af400c36f879e21ec1 (diff) | |
| download | brdo-2c77be1b606bebf638a5b9b9db5914cd68199cc0.tar.gz brdo-2c77be1b606bebf638a5b9b9db5914cd68199cc0.tar.bz2 | |
#984358 by dalin, David_Rothstein: Fixed Upgrade from 6.x to 7.x always pulls your site out of maintenance mode immediately
| -rw-r--r-- | includes/update.inc | 9 | ||||
| -rw-r--r-- | modules/system/system.install | 9 |
2 files changed, 17 insertions, 1 deletions
diff --git a/includes/update.inc b/includes/update.inc index 496b824c2..958e2477f 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -696,12 +696,19 @@ function update_fix_d7_requirements() { db_add_field('locales_source', 'context', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => 'The context this string applies to.')); } - // Rename 'site_offline_message' variable to 'maintenance_mode_message'. + // Rename 'site_offline_message' variable to 'maintenance_mode_message' + // and 'site_offline' variable to 'maintenance_mode'. // Old variable is removed in update for system.module, see // system_update_7036(). if ($message = variable_get('site_offline_message', NULL)) { variable_set('maintenance_mode_message', $message); } + // Old variable is removed in update for system.module, see + // system_update_7069(). + $site_offline = variable_get('site_offline', -1); + if ($site_offline != -1) { + variable_set('maintenance_mode', $site_offline); + } // Add ssid column and index. db_add_field('sessions', 'ssid', array('description' => "Secure session ID. The value is generated by Drupal's session handlers.", 'type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => '')); diff --git a/modules/system/system.install b/modules/system/system.install index 01924300a..22cb59020 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2965,6 +2965,15 @@ function system_update_7068() { } /** + * Remove the obsolete 'site_offline' variable. + * + * @see update_fix_d7_requirements() + */ +function system_update_7069() { + variable_del('site_offline'); +} + +/** * @} End of "defgroup updates-6.x-to-7.x" * The next series of updates should start at 8000. */ |