diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-09-12 18:29:32 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-09-12 18:29:32 +0000 |
| commit | 21ac9f1917595492fa9997e565bf11ec8d8cd14f (patch) | |
| tree | c90c3c454de850d5a315f5a4cae2404e87a56b94 /includes | |
| parent | b3fe5b9cbff70dd29a574e6770f32bcb48c6a78c (diff) | |
| download | brdo-21ac9f1917595492fa9997e565bf11ec8d8cd14f.tar.gz brdo-21ac9f1917595492fa9997e565bf11ec8d8cd14f.tar.bz2 | |
#174708 by multiple contributors: update jQuery to 1.2
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |