diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-28 17:35:20 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-28 17:35:20 +0000 |
commit | 0334d424779dac4f0adf89caa0362a03f93163c3 (patch) | |
tree | 91f9771d64488df6366eac5e76f783a1979576e1 /phpBB/includes/functions.php | |
parent | 761598e1b78d704b7f9aed82f8ac35673b4174bd (diff) | |
download | forums-0334d424779dac4f0adf89caa0362a03f93163c3.tar forums-0334d424779dac4f0adf89caa0362a03f93163c3.tar.gz forums-0334d424779dac4f0adf89caa0362a03f93163c3.tar.bz2 forums-0334d424779dac4f0adf89caa0362a03f93163c3.tar.xz forums-0334d424779dac4f0adf89caa0362a03f93163c3.zip |
- some changes to browser checking (was the reason for not working logins)
- partly working style acp
- other tiny changes here and there
git-svn-id: file:///svn/phpbb/trunk@5388 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r-- | phpBB/includes/functions.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8570ff2eed..7f816d9b1c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1481,11 +1481,14 @@ function build_hidden_fields($field_ary) /** * Parse cfg file */ -function parse_cfg_file($filename) +function parse_cfg_file($filename, $lines = false) { $parsed_items = array(); - $lines = file($filename); + if ($lines === false) + { + $lines = file($filename); + } foreach ($lines as $line) { |