mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 10:04:35 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:e107inc/e107

Browse Source
This commit is contained in:
SecretR
2016-01-15 13:50:50 +02:00
parent a609a899cc 169faeee04
commit 0ec4a37bcb
149 changed files with 1089 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/js_manager.php
View File

@@ -1028,9 +1028,10 @@ class e_jsmanager
$tp = e107::getParser();
$options = $this->arrayMergeDeepArray(array($this->_e_js_settings));
$json = $tp->toJSON($options);
$js = 'jQuery.extend(e107.settings, ' . $json . ');';
echo '<script>' . $js . '</script>';
echo "\n";
echo "<script>\n";
echo "var e107 = e107 || {'settings': {}, 'behaviors': {}};\n";
echo "jQuery.extend(e107.settings, " . $json . ");\n";
echo "</script>\n";
break;
case 'framework': // CDN frameworks - rendered before consolidation script (if enabled)