diff options
| author | David Rothstein <drothstein@gmail.com> | 2014-11-01 16:38:17 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2014-11-01 16:38:17 -0400 |
| commit | d5945c1c062bf8ef67c03cfb8681b312c59312e3 (patch) | |
| tree | a75982c5929cdf1538f6cec84a76e4fefbbc06a5 /includes/ajax.inc | |
| parent | 62c952c6e4cad7ac18ee8aea6791f4f0d1117231 (diff) | |
| download | brdo-d5945c1c062bf8ef67c03cfb8681b312c59312e3.tar.gz brdo-d5945c1c062bf8ef67c03cfb8681b312c59312e3.tar.bz2 | |
Issue #208611 by p.brouwers, mgifford, tstoeckler, DougKress, Jody Lynn, ksenzee | walkah: Made the Ajax system use drupal_array_merge_deep_array() to stop JavaScript settings from being added twice.
Diffstat (limited to 'includes/ajax.inc')
| -rw-r--r-- | includes/ajax.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/ajax.inc b/includes/ajax.inc index 8446bf891..31067c3e0 100644 --- a/includes/ajax.inc +++ b/includes/ajax.inc @@ -292,7 +292,7 @@ function ajax_render($commands = array()) { $scripts = drupal_add_js(); if (!empty($scripts['settings'])) { $settings = $scripts['settings']; - array_unshift($commands, ajax_command_settings(call_user_func_array('array_merge_recursive', $settings['data']), TRUE)); + array_unshift($commands, ajax_command_settings(drupal_array_merge_deep_array($settings['data']), TRUE)); } // Allow modules to alter any Ajax response. |