diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-11-18 05:35:39 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-11-18 05:35:39 +0000 |
| commit | 3a230683ea325535674613f27629c3ebd52792cb (patch) | |
| tree | 900745f5f550e62f149fa158893065e9ece7ea43 /modules/update | |
| parent | 0a985cdac943e08a322c27d4f7fe38a5737a5c91 (diff) | |
| download | brdo-3a230683ea325535674613f27629c3ebd52792cb.tar.gz brdo-3a230683ea325535674613f27629c3ebd52792cb.tar.bz2 | |
- Patch #958456 by rschwab, dww: update module uses incorrect variable for maintenance mode.
Diffstat (limited to 'modules/update')
| -rw-r--r-- | modules/update/update.authorize.inc | 8 | ||||
| -rw-r--r-- | modules/update/update.manager.inc | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/update/update.authorize.inc b/modules/update/update.authorize.inc index a262ad73a..fbbc31ca7 100644 --- a/modules/update/update.authorize.inc +++ b/modules/update/update.authorize.inc @@ -176,14 +176,14 @@ function update_authorize_update_batch_finished($success, $results) { $success = FALSE; } } - $offline = variable_get('site_offline', FALSE); + $offline = variable_get('maintenance_mode', FALSE); if ($success) { // Now that the update completed, we need to clear the cache of available // update data and recompute our status, so prevent show bogus results. _update_authorize_clear_update_status(); if ($offline) { - variable_set('site_offline', FALSE); + variable_set('maintenance_mode', FALSE); $page_message = array( 'message' => t('Update was completed successfully. Your site has been taken out of maintenance mode.'), 'type' => 'status', @@ -233,9 +233,9 @@ function update_authorize_install_batch_finished($success, $results) { $success = FALSE; } } - $offline = variable_get('site_offline', FALSE); + $offline = variable_get('maintenance_mode', FALSE); if ($success && $offline) { - variable_set('site_offline', FALSE); + variable_set('maintenance_mode', FALSE); $page_message = array( 'message' => t('Installation was completed successfully. Your site has been taken out of maintenance mode.'), 'type' => 'status', diff --git a/modules/update/update.manager.inc b/modules/update/update.manager.inc index 667ccafc5..c100e1658 100644 --- a/modules/update/update.manager.inc +++ b/modules/update/update.manager.inc @@ -357,7 +357,7 @@ function update_manager_update_ready_form($form, &$form_state) { '#suffix' => '</strong>', ); - $form['site_offline'] = array( + $form['maintenance_mode'] = array( '#title' => t('Perform updates with site in maintenance mode (strongly recommended)'), '#type' => 'checkbox', '#default_value' => TRUE, @@ -386,8 +386,8 @@ function update_manager_update_ready_form($form, &$form_state) { * @see system_authorized_get_url() */ function update_manager_update_ready_form_submit($form, &$form_state) { - if ($form_state['values']['site_offline'] == TRUE) { - variable_set('site_offline', TRUE); + if ($form_state['values']['maintenance_mode'] == TRUE) { + variable_set('maintenance_mode', TRUE); } if (!empty($_SESSION['update_manager_update_projects'])) { |