From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 8 Mar 2013 03:59:42 +0000 (-0800)
Subject: drupal_add_js isn't working - disabling seems the easiest fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7ccb31b2147b65a59da4b0523f078b7bc6680aa4;p=civicrm-core.git

drupal_add_js isn't working - disabling seems the easiest fix
---

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':