diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-10-15 15:33:27 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-10-15 15:33:27 +0200 |
| commit | 7ac8838b69b804e29f4e4751680424239f62e40d (patch) | |
| tree | 49f1bb18fe5f30cd6247a7044009a598e812f08b | |
| parent | c439cdc61859b14080484ee0cb54cd11e1197e0a (diff) | |
| parent | 6bfae1cd1a575ed61222a7cf2cb800f4e051a88c (diff) | |
| download | forums-7ac8838b69b804e29f4e4751680424239f62e40d.tar forums-7ac8838b69b804e29f4e4751680424239f62e40d.tar.gz forums-7ac8838b69b804e29f4e4751680424239f62e40d.tar.bz2 forums-7ac8838b69b804e29f4e4751680424239f62e40d.tar.xz forums-7ac8838b69b804e29f4e4751680424239f62e40d.zip | |
Merge branch 'ticket/igorw/9830' into develop-olympus
* ticket/igorw/9830:
[ticket/9830] Redirect to install directly when config.php does not exist.
| -rw-r--r-- | phpBB/common.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 9b6913e95f..c8b2fb9609 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -123,13 +123,11 @@ if (defined('IN_CRON')) $phpbb_root_path = dirname(__FILE__) . DIRECTORY_SEPARATOR; } -if (!file_exists($phpbb_root_path . 'config.' . $phpEx)) +if (file_exists($phpbb_root_path . 'config.' . $phpEx)) { - die("<p>The config.$phpEx file could not be found.</p><p><a href=\"{$phpbb_root_path}install/index.$phpEx\">Click here to install phpBB</a></p>"); + require($phpbb_root_path . 'config.' . $phpEx); } -require($phpbb_root_path . 'config.' . $phpEx); - if (!defined('PHPBB_INSTALLED')) { // Redirect the user to the installer |