Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #958456 by rschwab, dww: update module uses incorrect variable for maintenance mode.

merge-requests/26/head
Dries Buytaert 2010-11-18 05:35:39 +00:00
parent 0a985cdac9
commit 3a230683ea
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/update/update.authorize.inc
View File

@ -176,14 +176,14 @@ function update_authorize_update_batch_finished($success, $results) {
$success = FALSE; $success = FALSE;
} }
} }
$offline = variable_get('site_offline', FALSE); $offline = variable_get('maintenance_mode', FALSE);
if ($success) { if ($success) {
// Now that the update completed, we need to clear the cache of available // 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 data and recompute our status, so prevent show bogus results.
_update_authorize_clear_update_status(); _update_authorize_clear_update_status();
if ($offline) { if ($offline) {
variable_set('site_offline', FALSE); variable_set('maintenance_mode', FALSE);
$page_message = array( $page_message = array(
'message' => t('Update was completed successfully. Your site has been taken out of maintenance mode.'), 'message' => t('Update was completed successfully. Your site has been taken out of maintenance mode.'),
'type' => 'status', 'type' => 'status',
@ -233,9 +233,9 @@ function update_authorize_install_batch_finished($success, $results) {
$success = FALSE; $success = FALSE;
} }
} }
$offline = variable_get('site_offline', FALSE); $offline = variable_get('maintenance_mode', FALSE);
if ($success && $offline) { if ($success && $offline) {
variable_set('site_offline', FALSE); variable_set('maintenance_mode', FALSE);
$page_message = array( $page_message = array(
'message' => t('Installation was completed successfully. Your site has been taken out of maintenance mode.'), 'message' => t('Installation was completed successfully. Your site has been taken out of maintenance mode.'),
'type' => 'status', 'type' => 'status',

6
modules/update/update.manager.inc
View File

@ -357,7 +357,7 @@ function update_manager_update_ready_form($form, &$form_state) {
'#suffix' => '</strong>', '#suffix' => '</strong>',
); );
$form['site_offline'] = array( $form['maintenance_mode'] = array(
'#title' => t('Perform updates with site in maintenance mode (strongly recommended)'), '#title' => t('Perform updates with site in maintenance mode (strongly recommended)'),
'#type' => 'checkbox', '#type' => 'checkbox',
'#default_value' => TRUE, '#default_value' => TRUE,
@ -386,8 +386,8 @@ function update_manager_update_ready_form($form, &$form_state) {
* @see system_authorized_get_url() * @see system_authorized_get_url()
*/ */
function update_manager_update_ready_form_submit($form, &$form_state) { function update_manager_update_ready_form_submit($form, &$form_state) {
if ($form_state['values']['site_offline'] == TRUE) { if ($form_state['values']['maintenance_mode'] == TRUE) {
variable_set('site_offline', TRUE); variable_set('maintenance_mode', TRUE);
} }
if (!empty($_SESSION['update_manager_update_projects'])) { if (!empty($_SESSION['update_manager_update_projects'])) {