From d5945c1c062bf8ef67c03cfb8681b312c59312e3 Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Sat, 1 Nov 2014 16:38:17 -0400
Subject: 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.

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

(limited to 'includes/ajax.inc')

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.
-- 
cgit v1.2.3