diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-15 15:10:15 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-15 15:10:15 +0100 |
| commit | 2643fc174cfce2c89b096e1aa28b8433c1bd9088 (patch) | |
| tree | 4219fa16c1e196fca55429092494051eb899891c /lib/exe/js.php | |
| parent | 1da8dc976a4e9184fe550789a77d8e5cb866926f (diff) | |
| parent | 0ba750c06b51626ccace39f0f6be7062eebb0a40 (diff) | |
| download | rpg-2643fc174cfce2c89b096e1aa28b8433c1bd9088.tar.gz rpg-2643fc174cfce2c89b096e1aa28b8433c1bd9088.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into diff_navigation
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 040b8874d..04413b409 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -44,6 +44,7 @@ function js_out(){ DOKU_INC.'lib/scripts/jquery/jquery.cookie.js', DOKU_INC."lib/scripts/jquery/jquery-ui$min.js", DOKU_INC."lib/scripts/jquery/jquery-migrate$min.js", + DOKU_INC.'inc/lang/'.$conf['lang'].'/jquery.ui.datepicker.js', DOKU_INC."lib/scripts/fileuploader.js", DOKU_INC."lib/scripts/fileuploaderextended.js", DOKU_INC.'lib/scripts/helpers.js', @@ -112,6 +113,7 @@ function js_out(){ // load files foreach($files as $file){ + if(!file_exists($file)) continue; $ismin = (substr($file,-7) == '.min.js'); $debugjs = ($conf['allowdebug'] && strpos($file, DOKU_INC.'lib/scripts/') !== 0); |