Merge commit '762fe6d92bc' into 4.5-missing-prs

[civicrm-core.git] / CRM / Utils / System / DrupalBase.php

diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
index 3fc5054e03973c909bce77d6e926d94bee98455c..a881144a69ec84bb3233467d7f92b759a8d1338e 100644 (file)
--- a/CRM/Utils/System/DrupalBase.php
+++ b/CRM/Utils/System/DrupalBase.php
@@ -280,7 +280,7 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
    */
   function logger($message) {
     if (CRM_Core_Config::singleton()->userFrameworkLogging) {
-      watchdog('civicrm', $message, NULL, WATCHDOG_DEBUG);
+      watchdog('civicrm', '%message', array('%message' => $message), NULL, WATCHDOG_DEBUG);
     }
   }
 
@@ -290,4 +290,11 @@ abstract class CRM_Utils_System_DrupalBase extends CRM_Utils_System_Base {
   function clearResourceCache() {
     _drupal_flush_css_js();
   }
+
+  /**
+   * Append to coreResourcesList
+   */
+  function appendCoreResources(&$list) {
+    $list[] = 'js/crm.drupal.js';
+  }
 }