diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-06-27 18:44:23 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-06-27 18:44:55 +0200 |
| commit | 09edb7113c19b07ca11a79c2b0571f45ed2cc2eb (patch) | |
| tree | a10310daa88b34ce12a79a9dfeff547d5879457c /lib/exe/js.php | |
| parent | 136982455ae0eddc18744176db33fbd7b421e11c (diff) | |
| download | rpg-09edb7113c19b07ca11a79c2b0571f45ed2cc2eb.tar.gz rpg-09edb7113c19b07ca11a79c2b0571f45ed2cc2eb.tar.bz2 | |
use config cascade for userscripts and styles FS#1678
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index f2f9dfe6b..3756c43b9 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -29,6 +29,7 @@ if(!defined('SIMPLE_TEST')){ function js_out(){ global $conf; global $lang; + global $config_cascade; // The generated script depends on some dynamic options $cache = getCacheName('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js'); @@ -56,7 +57,9 @@ function js_out(){ // add possible plugin scripts and userscript $files = array_merge($files,js_pluginscripts()); - $files[] = DOKU_CONF.'userscript.js'; + if(isset($config_cascade['userscript']['default'])){ + $files[] = $config_cascade['userscript']['default']; + } // check cache age & handle conditional request header('Cache-Control: public, max-age=3600'); |