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

#976328 by bfroehle, dww: Fixed Update manager should not take you out of maintenance mode unless you asked it to

merge-requests/26/head
Angie Byron 2011-01-03 02:53:07 +00:00
parent 81f6ecd362
commit 937575ebee
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,8 @@ function update_authorize_update_batch_finished($success, $results) {
// update data and recompute our status, so prevent show bogus results.
_update_authorize_clear_update_status();
if ($offline) {
// Take the site out of maintenance mode if it was previously that way.
if ($offline && isset($_SESSION['maintenance_mode']) && $_SESSION['maintenance_mode'] == FALSE) {
variable_set('maintenance_mode', FALSE);
$page_message = array(
'message' => t('Update was completed successfully. Your site has been taken out of maintenance mode.'),
@ -213,6 +214,9 @@ function update_authorize_update_batch_finished($success, $results) {
$results['tasks'][] = t('Your modules have been downloaded and updated.');
$results['tasks'][] = t('<a href="@update">Run database updates</a>', array('@update' => base_path() . 'update.php'));
// Unset the variable since it is no longer needed.
unset($_SESSION['maintenance_mode']);
// Set all these values into the SESSION so authorize.php can display them.
$_SESSION['authorize_results']['success'] = $success;
$_SESSION['authorize_results']['page_message'] = $page_message;
@ -235,18 +239,21 @@ function update_authorize_install_batch_finished($success, $results) {
}
}
$offline = variable_get('maintenance_mode', FALSE);
if ($success && $offline) {
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',
);
}
elseif ($success && !$offline) {
$page_message = array(
'message' => t('Installation was completed successfully.'),
'type' => 'status',
);
if ($success) {
// Take the site out of maintenance mode if it was previously that way.
if ($offline && isset($_SESSION['maintenance_mode']) && $_SESSION['maintenance_mode'] == 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',
);
}
else {
$page_message = array(
'message' => t('Installation was completed successfully.'),
'type' => 'status',
);
}
}
elseif (!$success && !$offline) {
$page_message = array(
@ -261,6 +268,9 @@ function update_authorize_install_batch_finished($success, $results) {
);
}
// Unset the variable since it is no longer needed.
unset($_SESSION['maintenance_mode']);
// Set all these values into the SESSION so authorize.php can display them.
$_SESSION['authorize_results']['success'] = $success;
$_SESSION['authorize_results']['page_message'] = $page_message;

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

@ -397,6 +397,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) {
// Store maintenance_mode setting so we can restore it when done.
$_SESSION['maintenance_mode'] = variable_get('maintenance_mode', FALSE);
if ($form_state['values']['maintenance_mode'] == TRUE) {
variable_set('maintenance_mode', TRUE);
}