diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-08-02 14:32:04 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-08-02 14:32:04 +0000 |
| commit | a5ac9bbb3a0b21a8c1dc0b8c5825f0c11729cf6b (patch) | |
| tree | e6722dd5597793dd4a96e3608e1c4724436e9867 /phpBB/common.php | |
| parent | 8b85a84d554e2cee28b219f67d6b79c27f5e7e76 (diff) | |
| download | forums-a5ac9bbb3a0b21a8c1dc0b8c5825f0c11729cf6b.tar forums-a5ac9bbb3a0b21a8c1dc0b8c5825f0c11729cf6b.tar.gz forums-a5ac9bbb3a0b21a8c1dc0b8c5825f0c11729cf6b.tar.bz2 forums-a5ac9bbb3a0b21a8c1dc0b8c5825f0c11729cf6b.tar.xz forums-a5ac9bbb3a0b21a8c1dc0b8c5825f0c11729cf6b.zip | |
Rejiggle "board disabled" system to allow admin/mods access, eliminate duplication and "fudges" ... hopefully I've not overlooked something fundamental ...
git-svn-id: file:///svn/phpbb/trunk@4950 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index d1fb9ed49f..dfea399d72 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -7,8 +7,8 @@ // STARTED : Sat Feb 17, 2001 // COPYRIGHT : © 2001, 2003 phpBB Group // WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// +// LICENCE : GPL vs2.0 [ see /docs/COPYING ] +// // ------------------------------------------------------------- if (!defined('IN_PHPBB')) @@ -241,7 +241,7 @@ $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); // Grab global variables, re-cache if necessary if ($config = $cache->get('config')) { - $sql = 'SELECT * + $sql = 'SELECT * FROM ' . CONFIG_TABLE . ' WHERE is_dynamic = 1'; $result = $db->sql_query($sql); @@ -255,7 +255,7 @@ else { $config = $cached_config = array(); - $sql = 'SELECT * + $sql = 'SELECT * FROM ' . CONFIG_TABLE; $result = $db->sql_query($sql); @@ -301,11 +301,4 @@ if (file_exists('install')) // trigger_error('REMOVE_INSTALL'); } -// Show 'Board is disabled' message -if ($config['board_disable'] && !defined('IN_ADMIN') && !defined('IN_LOGIN')) -{ - $message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE'; - trigger_error($message); -} - ?>
\ No newline at end of file |