diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-12-11 19:34:15 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-12-11 19:34:15 +0100 |
| commit | 1517cb8444c231a57edfee2a6a1dfff4f05de493 (patch) | |
| tree | 7d10c567f6ad72e47e63f7e133dbb83439fd2fb0 /lib/exe/js.php | |
| parent | 63d3c166fac4bf342edbd27ebb0b2b82b42d2066 (diff) | |
| parent | 7b909d5e68cfee08dd85a3f28a2bdc9d6f41aaff (diff) | |
| download | rpg-1517cb8444c231a57edfee2a6a1dfff4f05de493.tar.gz rpg-1517cb8444c231a57edfee2a6a1dfff4f05de493.tar.bz2 | |
Merge pull request #954 from splitbrain/extendconfigcascade
Extendable config cascade for userstyles and userscript
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index ec236e98f..793104e81 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -72,8 +72,10 @@ function js_out(){ // add possible plugin scripts and userscript $files = array_merge($files,js_pluginscripts()); - if(isset($config_cascade['userscript']['default'])){ - $files[] = $config_cascade['userscript']['default']; + if(!empty($config_cascade['userscript']['default'])) { + foreach($config_cascade['userscript']['default'] as $userscript) { + $files[] = $userscript; + } } $cache_files = array_merge($files, getConfigFiles('main')); |