diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-02 13:33:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-02 13:33:06 +0000 |
| commit | 3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e (patch) | |
| tree | 99adb7132f8294497e6deb2615801229b2a061c3 /phpBB/install/install_install.php | |
| parent | cf7a2614088ad7a17de201abfc6e8a93d4cea5d7 (diff) | |
| download | forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar.gz forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar.bz2 forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.tar.xz forums-3ea2d53cb2b2554e944beb96fb98ea5c4c3aa23e.zip | |
some changes/fixes
git-svn-id: file:///svn/phpbb/trunk@6345 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_install.php')
| -rwxr-xr-x | phpBB/install/install_install.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 48058f4c0e..e0b7333f5a 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -20,9 +20,7 @@ if ( !defined('IN_INSTALL') ) if (!empty($setmodules)) { /* If phpBB is already installed we do not include this module - // This does not work at the moment because on installation the config file will be written before - // everything is finished. - if (@file_exists($phpbb_root_path . 'config.' . $phpEx)) + if (@file_exists($phpbb_root_path . 'config.' . $phpEx) && !file_exists($phpbb_root_path . 'cache/install_lock')) { include_once($phpbb_root_path . 'config.' . $phpEx); |