Commit 8e985b3f authored by Dries's avatar Dries

- Patch #319406 by AlexisWilke, Dave Reid, Damien Tournoud, kbahey: should...

- Patch #319406 by AlexisWilke, Dave Reid, Damien Tournoud, kbahey:  should only be cleared in the parent watchdog() call.
parent 96dc4766
...@@ -930,8 +930,11 @@ function watchdog($type, $message, $variables = array(), $severity = WATCHDOG_NO ...@@ -930,8 +930,11 @@ function watchdog($type, $message, $variables = array(), $severity = WATCHDOG_NO
foreach (module_implements('watchdog', TRUE) as $module) { foreach (module_implements('watchdog', TRUE) as $module) {
module_invoke($module, 'watchdog', $log_message); 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;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment