makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-04 09:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

for using the same cached file we need to have exact queries. :P

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9366 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-03-11 17:47:31 +00:00
parent 0d4a76a875
commit 43540f441d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/session.php
View file

@ -1657,7 +1657,8 @@ class user extends session
$this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang']; $this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang'];
$sql = 'SELECT image_name, image_filename, image_lang, image_height, image_width // Same query in style.php
$sql = 'SELECT *
FROM ' . STYLES_IMAGESET_DATA_TABLE . ' FROM ' . STYLES_IMAGESET_DATA_TABLE . '
WHERE imageset_id = ' . $this->theme['imageset_id'] . " WHERE imageset_id = ' . $this->theme['imageset_id'] . "
AND image_filename <> '' AND image_filename <> ''

7
phpBB/style.php
View file

@ -118,10 +118,11 @@ if ($id)
$user_image_lang = (file_exists($phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $user['user_lang'])) ? $user['user_lang'] : $config['default_lang']; $user_image_lang = (file_exists($phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $user['user_lang'])) ? $user['user_lang'] : $config['default_lang'];
// Same query in session.php
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_IMAGESET_DATA_TABLE . ' FROM ' . STYLES_IMAGESET_DATA_TABLE . '
WHERE imageset_id = ' . $theme['imageset_id'] . " WHERE imageset_id = ' . $theme['imageset_id'] . "
AND image_filename <> '' AND image_filename <> ''
AND image_lang IN ('" . $db->sql_escape($user_image_lang) . "', '')"; AND image_lang IN ('" . $db->sql_escape($user_image_lang) . "', '')";
$result = $db->sql_query($sql, 3600); $result = $db->sql_query($sql, 3600);
@ -257,11 +258,11 @@ if ($id)
case 'SRC': case 'SRC':
$replace[] = $imgs[$img]['src']; $replace[] = $imgs[$img]['src'];
break; break;
case 'WIDTH': case 'WIDTH':
$replace[] = $imgs[$img]['width']; $replace[] = $imgs[$img]['width'];
break; break;
case 'HEIGHT': case 'HEIGHT':
$replace[] = $imgs[$img]['height']; $replace[] = $imgs[$img]['height'];
break; break;