diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-18 11:00:43 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-18 11:00:43 +0100 |
| commit | 1af769714304054e63ffaeb41cfa51801785a59d (patch) | |
| tree | 6bb3de30d5a9700b758ec097b791e0abd64f1bb1 /phpBB/install/install_update.php | |
| parent | 96e5a04001b31e667468634493fd1380208cabaf (diff) | |
| parent | 249b9dcdb5a19e3d380a28f3df403106a41fadff (diff) | |
| download | forums-1af769714304054e63ffaeb41cfa51801785a59d.tar forums-1af769714304054e63ffaeb41cfa51801785a59d.tar.gz forums-1af769714304054e63ffaeb41cfa51801785a59d.tar.bz2 forums-1af769714304054e63ffaeb41cfa51801785a59d.tar.xz forums-1af769714304054e63ffaeb41cfa51801785a59d.zip | |
Merge remote-tracking branch 'prototech/ticket/12160' into develop
* prototech/ticket/12160:
[ticket/12160] Use phpbb_check_installation_exists() in the other modules.
[ticket/12160] Move phpbb_check_installation_exists() to functions_install.php
[ticket/12160] Check if phpBB is installed before creating phpBB container.
[ticket/12160] Add function to check if phpBB is installed.
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 5891efb375..cdfb7ecb06 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -19,16 +19,7 @@ if (!defined('IN_INSTALL')) if (!empty($setmodules)) { // If phpBB is not installed we do not include this module - if (@file_exists($phpbb_root_path . 'config.' . $phpEx) && !@file_exists($phpbb_root_path . 'cache/install_lock')) - { - include_once($phpbb_root_path . 'config.' . $phpEx); - - if (!defined('PHPBB_INSTALLED')) - { - return; - } - } - else + if (!phpbb_check_installation_exists($phpbb_root_path, $phpEx) || file_exists($phpbb_root_path . 'cache/install_lock')) { return; } |