diff options
Diffstat (limited to 'modules/update/update.authorize.inc')
-rw-r--r-- | modules/update/update.authorize.inc | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/modules/update/update.authorize.inc b/modules/update/update.authorize.inc index 16029568b..978fee4a4 100644 --- a/modules/update/update.authorize.inc +++ b/modules/update/update.authorize.inc @@ -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; |