From 21ac9f1917595492fa9997e565bf11ec8d8cd14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Wed, 12 Sep 2007 18:29:32 +0000
Subject: #174708 by multiple contributors: update jQuery to 1.2

---
 includes/common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index 6aeb02032..d781cbc4d 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1813,7 +1813,7 @@ function drupal_get_js($scope = 'header', $javascript = NULL) {
 
     switch ($type) {
       case 'setting':
-        $output .= '<script type="text/javascript">Drupal.extend({ settings: '. drupal_to_js(call_user_func_array('array_merge_recursive', $data)) ." });</script>\n";
+        $output .= '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js(call_user_func_array('array_merge_recursive', $data)) .");</script>\n";
         break;
       case 'inline':
         foreach ($data as $info) {
-- 
cgit v1.2.3