mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[task/config-class] Correctly merge cached config with dynamically loaded data.

Browse Source 
PHPBB3-9988
This commit is contained in:
Nils Adermann
2011-01-11 23:55:10 +01:00
parent 6b1e343d8d
commit 129d3c53bc
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/config/db.php
View File

@@ -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