From 8e985b3fbc5ca8e113ed0f1bfa288e3eb2bfd5a5 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 24 Nov 2008 06:17:40 +0000
Subject: - Patch #319406 by AlexisWilke, Dave Reid, Damien Tournoud, kbahey: 
 should only be cleared in the parent watchdog() call.

---
 includes/bootstrap.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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;
 }
 
 /**
-- 
cgit v1.2.3