diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 10:54:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-21 10:54:12 +0000 |
| commit | 5ca1f737035c492ded45dda81e880d2767a9b502 (patch) | |
| tree | 1f99961ed9445d1880eb2f952db3adb1fb5489c7 | |
| parent | de998acda29cb0177b5dd8bbaf0973150606a7d7 (diff) | |
| download | forums-5ca1f737035c492ded45dda81e880d2767a9b502.tar forums-5ca1f737035c492ded45dda81e880d2767a9b502.tar.gz forums-5ca1f737035c492ded45dda81e880d2767a9b502.tar.bz2 forums-5ca1f737035c492ded45dda81e880d2767a9b502.tar.xz forums-5ca1f737035c492ded45dda81e880d2767a9b502.zip | |
#25805
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8513 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/style.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index fcd18a199c..05725557d3 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -94,6 +94,7 @@ <li>[Change] Make utf8_htmlspecialchars not pass its argument by reference (Bug #21885)</li> <li>[Fix] Bring the PostgreSQL backup system back to working order (Bug #22385)</li> <li>[Change] Sort the tables at the database table backup screen</li> + <li>[Fix] Update correct theme for cached styles in style.php (Bug #25805)</li> </ul> <a name="v300"></a><h3>1.ii. Changes since 3.0.0</h3> diff --git a/phpBB/style.php b/phpBB/style.php index 599434d087..cb2bcff115 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -95,7 +95,7 @@ if ($id) $user = array('user_id' => ANONYMOUS); } - $sql = 'SELECT s.style_id, c.theme_data, c.theme_path, c.theme_name, c.theme_mtime, i.*, t.template_path + $sql = 'SELECT s.style_id, c.theme_id, c.theme_data, c.theme_path, c.theme_name, c.theme_mtime, i.*, t.template_path FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . ' i WHERE s.style_id = ' . $id . ' AND t.template_id = s.template_id @@ -193,7 +193,7 @@ if ($id) ); $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE theme_id = $id"; + WHERE theme_id = {$theme['theme_id']}"; $db->sql_query($sql); $cache->destroy('sql', STYLES_THEME_TABLE); |