aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-01-22 20:44:37 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-01-22 20:44:37 +0000
commit644735d9acd2f4df2f510da733daa04c88ef81e6 (patch)
treeba2b99b41eabac9482a7eedb028e4e5d8c2e62eb /phpBB/common.php
parent4be10373b84013f46a7ecb97059dd0dcfd7a9b5e (diff)
downloadforums-644735d9acd2f4df2f510da733daa04c88ef81e6.tar
forums-644735d9acd2f4df2f510da733daa04c88ef81e6.tar.gz
forums-644735d9acd2f4df2f510da733daa04c88ef81e6.tar.bz2
forums-644735d9acd2f4df2f510da733daa04c88ef81e6.tar.xz
forums-644735d9acd2f4df2f510da733daa04c88ef81e6.zip
Re-enabled fully dynamic config settings.
git-svn-id: file:///svn/phpbb/trunk@3360 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php17
1 files changed, 13 insertions, 4 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index ee38d3c203..4d57a54004 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -148,13 +148,22 @@ $template = new template();
$db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
// Grab global variables, re-cache if necessary
-if (!($config = $cache->get('config')))
+if ($config = $cache->get('config'))
+{
+ $sql = 'SELECT *
+ FROM ' . CONFIG_TABLE . '
+ WHERE is_dynamic = 1';
+ $result = $db->sql_query($sql);
+
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $config[$row['config_name']] = $row['config_value'];
+ }
+}
+else
{
$config = array();
-/*
- WHERE is_dynamic = 1';
-*/
$sql = 'SELECT *
FROM ' . CONFIG_TABLE;
$result = $db->sql_query($sql);