aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install/helper
diff options
context:
space:
mode:
authorMate Bartus <mate.bartus@gmail.com>2015-07-23 22:55:31 +0200
committerMate Bartus <mate.bartus@gmail.com>2015-07-23 22:55:31 +0200
commite08f1341127792e378580a10bbb0bdeafe93ff8d (patch)
tree4e59cef6e31e7f08fb80197c552966b45d47560d /phpBB/phpbb/install/helper
parentfbd5929606169d3f780f0a59760c171b20bd906d (diff)
downloadforums-e08f1341127792e378580a10bbb0bdeafe93ff8d.tar
forums-e08f1341127792e378580a10bbb0bdeafe93ff8d.tar.gz
forums-e08f1341127792e378580a10bbb0bdeafe93ff8d.tar.bz2
forums-e08f1341127792e378580a10bbb0bdeafe93ff8d.tar.xz
forums-e08f1341127792e378580a10bbb0bdeafe93ff8d.zip
[ticket/13740] Fix is_phpbb_installed() method
PHPBB3-13740
Diffstat (limited to 'phpBB/phpbb/install/helper')
-rw-r--r--phpBB/phpbb/install/helper/install_helper.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/install/helper/install_helper.php b/phpBB/phpbb/install/helper/install_helper.php
index c1506de5bf..ffe36cd645 100644
--- a/phpBB/phpbb/install/helper/install_helper.php
+++ b/phpBB/phpbb/install/helper/install_helper.php
@@ -47,14 +47,14 @@ class install_helper
*/
public function is_phpbb_installed()
{
- $config_path = $this->phpbb_root_path . 'config' . $this->php_ext;
+ $config_path = $this->phpbb_root_path . 'config.' . $this->php_ext;
$install_lock_path = $this->phpbb_root_path . 'cache/install_lock';
- if (file_exists($config_path) && !file_exists($install_lock_path))
+ if (file_exists($config_path) && !file_exists($install_lock_path) && filesize($config_path))
{
- include_once $config_path;
+ return true;
}
- return defined('PHPBB_INSTALLED');
+ return false;
}
}