diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-05-08 20:55:40 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-05-08 20:55:40 +0200 |
| commit | 9199737c351d653a1d384cb50ed0d185f6512826 (patch) | |
| tree | 2da4dbc0b92a72c767712549b6d90f53b0a3605e /lib/exe/js.php | |
| parent | e68653d8ef3df043761e4042c563d65731f9b9c6 (diff) | |
| parent | 2b537ba8dc1863d603770c208ae4f91d4d0877b9 (diff) | |
| download | rpg-9199737c351d653a1d384cb50ed0d185f6512826.tar.gz rpg-9199737c351d653a1d384cb50ed0d185f6512826.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 5f376ee24..b2ae3f7fe 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -188,9 +188,11 @@ function js_cacheok($cache,$files){ $ctime = @filemtime($cache); if(!$ctime) return false; //There is no cache + global $config_cascade; + // some additional files to check $files = array_merge($files, getConfigFiles('main')); - $files[] = DOKU_CONF.'userscript.js'; + $files[] = $config_cascade['userscript']['default']; $files[] = __FILE__; // now walk the files |