summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchris <chris@jalakai.co.uk>2005-12-13 18:56:33 +0100
committerchris <chris@jalakai.co.uk>2005-12-13 18:56:33 +0100
commite8dfb12925642c24ff59441b710012ffb2114c6a (patch)
tree87108556d4e8e71449fc67016b2c37ce9c584a6a
parent4ce6ec0863bdb96a9032cb42db235de51f9afb55 (diff)
downloadrpg-e8dfb12925642c24ff59441b710012ffb2114c6a.tar.gz
rpg-e8dfb12925642c24ff59441b710012ffb2114c6a.tar.bz2
confutils fix to allow '#' when immediately preceeded by'&' (# is a comment indicator otherwise)
darcs-hash:20051213175633-9b6ab-1103b79a9d956d72e20b3df6ba4e5e6b55443c78.gz
-rw-r--r--inc/confutils.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/confutils.php b/inc/confutils.php
index 1415d48f6..9432c10d5 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -131,7 +131,7 @@ function confToHash($file,$lower=false) {
foreach ( $lines as $line ) {
//ignore comments
- $line = preg_replace('/[^&]?#.*$/','',$line);
+ $line = preg_replace('/(?<!&)#.*$/','',$line);
$line = trim($line);
if(empty($line)) continue;
$line = preg_split('/\s+/',$line,2);