From 129d3c53bc6f826ae9a9d484fda4f38f6963b375 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 11 Jan 2011 23:55:10 +0100 Subject: [task/config-class] Correctly merge cached config with dynamically loaded data. PHPBB3-9988 --- phpBB/includes/config/db.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'phpBB/includes') diff --git a/phpBB/includes/config/db.php b/phpBB/includes/config/db.php index 1e07e1f67f..a753d12cd0 100644 --- a/phpBB/includes/config/db.php +++ b/phpBB/includes/config/db.php @@ -52,7 +52,11 @@ class phpbb_config_db extends phpbb_config FROM ' . $this->table . ' WHERE is_dynamic = 1'; $result = $this->db->sql_query($sql); - $config += $this->db->sql_fetchrowset($result); + + while ($row = $this->db->sql_fetchrow($result)) + { + $config[$row['config_name']] = $row['config_value']; + } $this->db->sql_freeresult($result); } else -- cgit v1.2.1