From ee617b97e270d939c5df78409e9b5a04e1bbee0e Mon Sep 17 00:00:00 2001
From: lonalore <lonalore@freemail.hu>
Date: Tue, 6 Dec 2016 14:10:35 +0100
Subject: [PATCH] Fix for array merging.

---
 e107_handlers/js_manager.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/e107_handlers/js_manager.php b/e107_handlers/js_manager.php
index 116d96192..d74e65c3a 100644
--- a/e107_handlers/js_manager.php
+++ b/e107_handlers/js_manager.php
@@ -1075,7 +1075,7 @@ class e_jsmanager
 			break;
 
 			case 'settings':
-				$this->_e_js_settings = array_merge_recursive($this->_e_js_settings, $file_path);
+				$this->_e_js_settings = $this->arrayMergeDeepArray(array($this->_e_js_settings, $file_path));
 				return $this;
 			break;
 
@@ -1115,8 +1115,7 @@ class e_jsmanager
 		{
 			case 'settings':
 				$tp = e107::getParser();
-				$options = $this->arrayMergeDeepArray(array($this->_e_js_settings));
-				$json = $tp->toJSON($options);
+				$json = $tp->toJSON($this->_e_js_settings);
 				echo "<script>\n";
 				echo "var e107 = e107 || {'settings': {}, 'behaviors': {}};\n";
 				echo "jQuery.extend(e107.settings, " . $json . ");\n";