mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 11:20:25 +02:00
Code Issues Releases Wiki Activity

Fix for array merging.

Browse Source
This commit is contained in:
lonalore
2016-12-06 14:10:35 +01:00
parent 5273f41ab1
commit ee617b97e2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/js_manager.php
View File

@@ -1075,7 +1075,7 @@ class e_jsmanager
break; break;
case 'settings': 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; return $this;
break; break;
@@ -1115,8 +1115,7 @@ class e_jsmanager
{ {
case 'settings': case 'settings':
$tp = e107::getParser(); $tp = e107::getParser();
$options = $this->arrayMergeDeepArray(array($this->_e_js_settings)); $json = $tp->toJSON($this->_e_js_settings);
$json = $tp->toJSON($options);
echo "<script>\n"; echo "<script>\n";
echo "var e107 = e107 || {'settings': {}, 'behaviors': {}};\n"; echo "var e107 = e107 || {'settings': {}, 'behaviors': {}};\n";
echo "jQuery.extend(e107.settings, " . $json . ");\n"; echo "jQuery.extend(e107.settings, " . $json . ");\n";