Commit 2c77be1b authored by webchick's avatar webchick
Browse files

#984358 by dalin, David_Rothstein: Fixed Upgrade from 6.x to 7.x always pulls...

#984358 by dalin, David_Rothstein: Fixed Upgrade from 6.x to 7.x always pulls your site out of maintenance mode immediately
parent 0369f3f8
......@@ -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' => ''));
......
......@@ -2964,6 +2964,15 @@ function system_update_7068() {
db_change_field('url_alias', 'language', 'language', $spec);
}
/**
* 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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment