diff options
| author | Cesar G <prototech91@gmail.com> | 2014-02-22 20:23:30 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-02-22 20:23:30 -0800 |
| commit | 249b9dcdb5a19e3d380a28f3df403106a41fadff (patch) | |
| tree | 742abbcaeba0190b54058c365fa69ee5954da6a3 | |
| parent | fc33a0c1763da363ff3063bd0c42a715a673c622 (diff) | |
| download | forums-249b9dcdb5a19e3d380a28f3df403106a41fadff.tar forums-249b9dcdb5a19e3d380a28f3df403106a41fadff.tar.gz forums-249b9dcdb5a19e3d380a28f3df403106a41fadff.tar.bz2 forums-249b9dcdb5a19e3d380a28f3df403106a41fadff.tar.xz forums-249b9dcdb5a19e3d380a28f3df403106a41fadff.zip | |
[ticket/12160] Use phpbb_check_installation_exists() in the other modules.
PHPBB3-12160
| -rw-r--r-- | phpBB/install/install_install.php | 9 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 11 |
2 files changed, 3 insertions, 17 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index a2d44f2b6c..72e6f6affa 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -18,14 +18,9 @@ if (!defined('IN_INSTALL')) if (!empty($setmodules)) { // If phpBB is already installed we do not include this module - if (@file_exists($phpbb_root_path . 'config.' . $phpEx) && !file_exists($phpbb_root_path . 'cache/install_lock')) + if (phpbb_check_installation_exists($phpbb_root_path, $phpEx) && !file_exists($phpbb_root_path . 'cache/install_lock')) { - include_once($phpbb_root_path . 'config.' . $phpEx); - - if (defined('PHPBB_INSTALLED')) - { - return; - } + return; } $module[] = array( diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index dc6e57c851..87fe56737a 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; } |