summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <gohr@cosmocode.de>2014-04-09 16:00:57 +0200
committerAndreas Gohr <gohr@cosmocode.de>2014-04-09 16:00:57 +0200
commit969df2f1a2855988cc9c14870869d05fd42037ad (patch)
treecefcb3e2763ef294f46cb1ec41e10857b8928804
parent481343c25e1c66a6bc789de47ea9f8e257b67be1 (diff)
downloadrpg-969df2f1a2855988cc9c14870869d05fd42037ad.tar.gz
rpg-969df2f1a2855988cc9c14870869d05fd42037ad.tar.bz2
fix include_once for JavaScript
the second include was never removed, causing an endless loop.
-rw-r--r--lib/exe/js.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 4d4660197..bec12ef7a 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -166,7 +166,10 @@ function js_load($file){
// is it a include_once?
if($match[1]){
$base = utf8_basename($ifile);
- if($loaded[$base]) continue;
+ if($loaded[$base]){
+ $data = str_replace($match[0], '' ,$data);
+ continue;
+ }
$loaded[$base] = true;
}