diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-11-24 06:17:40 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-11-24 06:17:40 +0000 |
| commit | 8e985b3fbc5ca8e113ed0f1bfa288e3eb2bfd5a5 (patch) | |
| tree | b391b9199484044470ad865572ec736f8f46d26b /includes | |
| parent | 96dc47665ef84588874200aec2a5a61e4b93e19f (diff) | |
| download | brdo-8e985b3fbc5ca8e113ed0f1bfa288e3eb2bfd5a5.tar.gz brdo-8e985b3fbc5ca8e113ed0f1bfa288e3eb2bfd5a5.tar.bz2 | |
- Patch #319406 by AlexisWilke, Dave Reid, Damien Tournoud, kbahey: should only be cleared in the parent watchdog() call.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index b2f4a27ed..adf56c85c 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -930,8 +930,11 @@ function watchdog($type, $message, $variables = array(), $severity = WATCHDOG_NO foreach (module_implements('watchdog', TRUE) as $module) { module_invoke($module, 'watchdog', $log_message); } + + // It is critical that the semaphore is only cleared here, in the parent + // watchdog() call (not outside the loop), to prevent recursive execution. + $in_error_state = FALSE; } - $in_error_state = FALSE; } /** |