aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorGraham Eames <grahamje@users.sourceforge.net>2006-08-12 15:37:28 +0000
committerGraham Eames <grahamje@users.sourceforge.net>2006-08-12 15:37:28 +0000
commit560c570823877b6fb3cb78e6ad0fdf26a1427f7f (patch)
treeb2afdcdd6e977aa07bf5e130176bb6d71f50b91b /phpBB/common.php
parentf5cabf864c7bf29f5415a1ed315dc08b35f759c2 (diff)
downloadforums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.tar
forums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.tar.gz
forums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.tar.bz2
forums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.tar.xz
forums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.zip
Allow ACP access if install/ is present and display the generic board disabled message otherwise so that a user does not know the reason for it being disabled
git-svn-id: file:///svn/phpbb/trunk@6276 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index d52cf8c884..c69ee4395e 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -191,10 +191,11 @@ unset($dbpasswd);
$config = $cache->obtain_config();
$dss_seeded = false;
-// Warn about install/ directory
-if (file_exists($phpbb_root_path . 'install'))
+// Disable board if the install/ directory is still present
+if (file_exists($phpbb_root_path . 'install') && !defined('ADMIN_START'))
{
- trigger_error('REMOVE_INSTALL');
+ $message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
+ trigger_error($message);
}
?> \ No newline at end of file