diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-07-11 22:04:57 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-07-11 22:04:57 +0000 |
| commit | f5ea36bb4d44e8b74b00653a635de01039876427 (patch) | |
| tree | 56540ffc170062e9c0231c5c046af05ca614fd4c | |
| parent | 01ae6f500ec5d8fb56ceef826d56f1fda6082bea (diff) | |
| download | brdo-f5ea36bb4d44e8b74b00653a635de01039876427.tar.gz brdo-f5ea36bb4d44e8b74b00653a635de01039876427.tar.bz2 | |
#125533 by keve: do not continue bootstrap if the process was called back with a phase already executed
| -rw-r--r-- | includes/bootstrap.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index e1b28aca7..6683371cd 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -852,6 +852,11 @@ function drupal_anonymous_user($session = '') { function drupal_bootstrap($phase) { static $phases = array(DRUPAL_BOOTSTRAP_CONFIGURATION, DRUPAL_BOOTSTRAP_EARLY_PAGE_CACHE, DRUPAL_BOOTSTRAP_DATABASE, DRUPAL_BOOTSTRAP_ACCESS, DRUPAL_BOOTSTRAP_SESSION, DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE, DRUPAL_BOOTSTRAP_LANGUAGE, DRUPAL_BOOTSTRAP_PATH, DRUPAL_BOOTSTRAP_FULL); + // Stop early if $phase was already executed. + if (!in_array($phase, $phases)) { + return; + } + while (!is_null($current_phase = array_shift($phases))) { _drupal_bootstrap($current_phase); if ($phase == $current_phase) { |