Skip to content
Snippets Groups Projects
Commit ea62c4d0 authored by Brandon Bergren's avatar Brandon Bergren
Browse files

#291162, part 1: Use recursive merging to avoid stomping the settings array.

parent 95a5582e
No related branches found
No related tags found
No related merge requests found
......@@ -1152,7 +1152,7 @@ function theme_gmap($element) {
// Inline settings extend.
$o .= '<script type="text/javascript">'."\n";
$o .= "/* <![CDATA[ */\n";
$o .= 'jQuery.extend(Drupal, { settings: '. drupal_to_js(array('gmap' => array($element['#map'] => $map))) ." });\n";
$o .= 'jQuery.extend(true, Drupal, { settings: '. drupal_to_js(array('gmap' => array($element['#map'] => $map))) ." });\n";
$o .= "/* ]]> */\n";
$o .= "</script>\n";
return $o;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment