From 213a5f197ee679e31d8f57836543505afe379d00 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 23 Jun 2014 12:55:56 +1200
Subject: [PATCH] Revert "CRM-14850 update use of ufLogging to not call
 ->is_drupal"

This reverts commit ac056893bd4a6816bc6c8b262cd0f30f87c5cad3.
---
 CRM/Core/Error.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index 87b60d3756..f11d4ba618 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -580,6 +580,7 @@ class CRM_Core_Error extends PEAR_ErrorStack {
    * @static
    */
   static function debug_log_message($message, $out = FALSE, $comp = '') {
+    $config = CRM_Core_Config::singleton();
 
     $file_log = self::createDebugLogger($comp);
     $file_log->log("$message\n");
@@ -589,7 +590,11 @@ class CRM_Core_Error extends PEAR_ErrorStack {
     }
     $file_log->close();
 
-    if (CRM_Core_Config::singleton()->userSystem->logger($message));
+    if ($config->userFrameworkLogging) {
+      if ($config->userSystem->is_drupal and function_exists('watchdog')) {
+        watchdog('civicrm', $message, NULL, WATCHDOG_DEBUG);
+      }
+    }
 
     return $str;
   }
-- 
2.25.1