diff options
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; } /** |