diff options
| author | Cesar G <prototech91@gmail.com> | 2014-02-22 20:22:36 -0800 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-02-22 20:22:36 -0800 |
| commit | fc33a0c1763da363ff3063bd0c42a715a673c622 (patch) | |
| tree | c72fb126ea71f31476e3fd6092f160a10b5f0881 | |
| parent | d6ec463977395d3210c67d207921923a27cb1195 (diff) | |
| download | forums-fc33a0c1763da363ff3063bd0c42a715a673c622.tar forums-fc33a0c1763da363ff3063bd0c42a715a673c622.tar.gz forums-fc33a0c1763da363ff3063bd0c42a715a673c622.tar.bz2 forums-fc33a0c1763da363ff3063bd0c42a715a673c622.tar.xz forums-fc33a0c1763da363ff3063bd0c42a715a673c622.zip | |
[ticket/12160] Move phpbb_check_installation_exists() to functions_install.php
PHPBB3-12160
| -rw-r--r-- | phpBB/includes/functions.php | 19 | ||||
| -rw-r--r-- | phpBB/includes/functions_install.php | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0c369bea5b..689a682de3 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5303,22 +5303,3 @@ function phpbb_convert_30_dbms_to_31($dbms) throw new \RuntimeException("You have specified an invalid dbms driver: $dbms"); } - -/** -* Check whether phpBB is installed. -* -* @param string $phpbb_root_path Path to the phpBB board root. -* @param string $php_ext PHP file extension. -* -* @return bool Returns true if phpBB is installed. -*/ -function phpbb_check_installation_exists($phpbb_root_path, $php_ext) -{ - // Try opening config file - if (@file_exists($phpbb_root_path . 'config.' . $php_ext)) - { - include($phpbb_root_path . 'config.' . $php_ext); - } - - return defined('PHPBB_INSTALLED'); -} diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index deb304b838..476535ae5b 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -581,3 +581,22 @@ function phpbb_ignore_new_file_on_update($phpbb_root_path, $file) return $ignore_new_file; } + +/** +* Check whether phpBB is installed. +* +* @param string $phpbb_root_path Path to the phpBB board root. +* @param string $php_ext PHP file extension. +* +* @return bool Returns true if phpBB is installed. +*/ +function phpbb_check_installation_exists($phpbb_root_path, $php_ext) +{ + // Try opening config file + if (file_exists($phpbb_root_path . 'config.' . $php_ext)) + { + include($phpbb_root_path . 'config.' . $php_ext); + } + + return defined('PHPBB_INSTALLED'); +} |