From 7ccb31b2147b65a59da4b0523f078b7bc6680aa4 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 7 Mar 2013 19:59:42 -0800 Subject: [PATCH] drupal_add_js isn't working - disabling seems the easiest fix --- CRM/Utils/System/Drupal6.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CRM/Utils/System/Drupal6.php b/CRM/Utils/System/Drupal6.php index ff46904e54..bdcd7eca7a 100644 --- a/CRM/Utils/System/Drupal6.php +++ b/CRM/Utils/System/Drupal6.php @@ -327,6 +327,10 @@ SELECT name, mail * @access public */ public function addScriptUrl($url, $region) { + return FALSE; + // The below code does not prevent drupal's and civi's jquery from getting mixed up + // Dropping D6 support for drupal_add_js seems reasonable since we no longer officially support D6 + // But leaving the code in place in case anyone really wants to tackle it. switch ($region) { case 'html-header': case 'page-footer': @@ -359,6 +363,10 @@ SELECT name, mail * @access public */ public function addScript($code, $region) { + return FALSE; + // The below code does not prevent drupal's and civi's jquery from getting mixed up + // Dropping D6 support for drupal_add_js seems reasonable since we no longer officially support D6 + // But leaving the code in place in case anyone really wants to tackle it. switch ($region) { case 'html-header': case 'page-footer': -- 2.25.1