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

- Patch #309821 by sun et al: automatic site maintenance during update.php.

merge-requests/26/head
Dries Buytaert 2008-10-08 11:11:09 +00:00
parent adad3556bd
commit 3257718a02
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
update.php
View File

@ -290,10 +290,10 @@ function update_script_selection_form() {
function update_batch() {
global $base_url;
// During the update, toggle site maintenance so that schema changes
// don't effect visiting users.
$site_offline = variable_get('site_offline', FALSE);
if ($site_offline == FALSE) {
// During the update, toggle site maintenance so that schema changes do not
// affect visiting users.
$_SESSION['site_offline'] = variable_get('site_offline', FALSE);
if ($_SESSION['site_offline'] == FALSE) {
variable_set('site_offline', TRUE);
}
@ -320,12 +320,6 @@ function update_batch() {
);
batch_set($batch);
batch_process($base_url . '/update.php?op=results', $base_url . '/update.php');
// Now that the update is done, we can disable site maintenance if
// it was previously turned off.
if ($site_offline == FALSE) {
variable_set('site_offline', FALSE);
}
}
function update_finished($success, $results, $operations) {
@ -335,6 +329,13 @@ function update_finished($success, $results, $operations) {
$_SESSION['update_results'] = $results;
$_SESSION['update_success'] = $success;
$_SESSION['updates_remaining'] = $operations;
// Now that the update is done, we can disable site maintenance if it was
// previously turned off.
if (isset($_SESSION['site_offline']) && $_SESSION['site_offline'] == FALSE) {
variable_set('site_offline', FALSE);
unset($_SESSION['site_offline']);
}
}
function update_helpful_links() {