summaryrefslogtreecommitdiff
path: root/inc/confutils.php
diff options
context:
space:
mode:
authorAdrian Lang <lang@cosmocode.de>2010-01-26 11:30:10 +0100
committerAdrian Lang <lang@cosmocode.de>2010-01-26 11:30:10 +0100
commitd3f4f410ba72f7d4ccd8a66ca2667902de30d496 (patch)
tree4f62f256eaf312f61d60d7a30c15473bea7fc348 /inc/confutils.php
parent7d723f3d24511105ce37006f9439632c3d8f915e (diff)
parent3c743051cd4555135bdbf55c27733a2281463b4c (diff)
downloadrpg-d3f4f410ba72f7d4ccd8a66ca2667902de30d496.tar.gz
rpg-d3f4f410ba72f7d4ccd8a66ca2667902de30d496.tar.bz2
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc/confutils.php')
-rw-r--r--inc/confutils.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/confutils.php b/inc/confutils.php
index de63846de..7850682ba 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -143,6 +143,7 @@ function getSchemes() {
* @author Gina Haeussge <gina@foosel.net>
*/
function linesToHash($lines, $lower=false) {
+ $conf = array();
foreach ( $lines as $line ) {
//ignore comments (except escaped ones)
$line = preg_replace('/(?<![&\\\\])#.*$/','',$line);