aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
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