makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13740] Fix is_phpbb_installed() method

Browse source 
PHPBB3-13740
This commit is contained in:
Mate Bartus 2015-07-23 22:55:31 +02:00
parent fbd5929606
commit e08f134112
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/install/controller/install.php
View file

@ -111,7 +111,7 @@ class install
{ {
if ($this->install_helper->is_phpbb_installed()) if ($this->install_helper->is_phpbb_installed())
{ {
throw new http_exception(404, 'PAGE_NOT_FOUND'); die ('phpBB is already installed');
} }
$this->template->assign_vars(array( $this->template->assign_vars(array(

8
phpBB/phpbb/install/helper/install_helper.php
View file

@ -47,14 +47,14 @@ class install_helper
*/ */
public function is_phpbb_installed() 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'; $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;
} }
} }