mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-13 17:09:46 +01:00
Code Issues Releases Wiki Activity

Merge pull request #2118 from lonalore/js

Browse Source 
Fix for array merging.
This commit is contained in:
Cameron 2016-12-06 07:02:35 -08:00 committed by GitHub
commit 9d42dd7e42
1 changed files with 2 additions and 3 deletions
Show Stats 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;
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";