summaryrefslogtreecommitdiff
path: root/lib/exe/js.php
diff options
context:
space:
mode:
authorAdrian Lang <lang@cosmocode.de>2009-11-19 15:28:45 +0100
committerAdrian Lang <lang@cosmocode.de>2010-01-12 10:57:19 +0100
commit98dba5ad053f051c0291c9ac9b291c783ebed372 (patch)
treefe79e7ddce9bac1e5d2599a08ba2bceb6c0febc4 /lib/exe/js.php
parent45c73e39a116986b7d3a6328a72ac18a054ddf9c (diff)
downloadrpg-98dba5ad053f051c0291c9ac9b291c783ebed372.tar.gz
rpg-98dba5ad053f051c0291c9ac9b291c783ebed372.tar.bz2
Allow hyphens and underscores in javascript include filenames
darcs-hash:20091119142845-e4919-5394617fd83d4de22673491b868f7040c25fb290.gz
Diffstat (limited to 'lib/exe/js.php')
-rw-r--r--lib/exe/js.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php
index ab67288cd..5be4d2b6b 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -151,7 +151,7 @@ function js_load($file){
static $loaded = array();
$data = io_readFile($file);
- while(preg_match('#/\*\s*DOKUWIKI:include(_once)?\s+([\w\./]+)\s*\*/#',$data,$match)){
+ while(preg_match('#/\*\s*DOKUWIKI:include(_once)?\s+([\w\.\-_/]+)\s*\*/#',$data,$match)){
$ifile = $match[2];
// is it a include_once?