summaryrefslogtreecommitdiff
path: root/itjs.php
diff options
context:
space:
mode:
authorUrban Müller2014-10-06 15:47:45 +0200
committerUrban Müller2014-10-06 15:47:45 +0200
commitaa4b89767df4a0753f1a3b62e04a4817bb199fef (patch)
tree429ce168b3fbc8f3ec00b842db8072751bdbd0d7 /itjs.php
parent61f52c04e6185d08a968b80e4d36fa0b8677cfb0 (diff)
downloaditools-aa4b89767df4a0753f1a3b62e04a4817bb199fef.tar.gz
itools-aa4b89767df4a0753f1a3b62e04a4817bb199fef.tar.bz2
itools-aa4b89767df4a0753f1a3b62e04a4817bb199fef.zip
accept GET params in join script files, accept script list in param f
Diffstat (limited to 'itjs.php')
-rw-r--r--itjs.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/itjs.php b/itjs.php
index 62cd474..fb3fc42 100644
--- a/itjs.php
+++ b/itjs.php
@@ -31,7 +31,7 @@ if (false && $crc != "-" && !$_SERVER['HTTP_CACHE_CONTROL'] && $_SERVER['HTTP_IF
exit;
}
-$files = itjs::filenames(it::match('/itjs/([a-z0-9_,.-]*)', $_SERVER['PHP_SELF']));
+$files = itjs::filenames($_GET['files'] ?: it::match('/itjs/([-a-z0-9_,.]*)', $_SERVER['PHP_SELF']));
$data = itjs::filecontents($files);
$file = end($files);