From 43540f441d6ec6624812c2d2397552ae084b8001 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 11 Mar 2009 17:47:31 +0000
Subject: [PATCH] for using the same cached file we need to have exact queries.
 :P

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9366 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/session.php | 3 ++-
 phpBB/style.php            | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 5c9bcc4f88..6112decf09 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -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'];
 
-		$sql = 'SELECT image_name, image_filename, image_lang, image_height, image_width
+		// Same query in style.php
+		$sql = 'SELECT *
 			FROM ' . STYLES_IMAGESET_DATA_TABLE . '
 			WHERE imageset_id = ' . $this->theme['imageset_id'] . "
 			AND image_filename <> ''
diff --git a/phpBB/style.php b/phpBB/style.php
index 843c18b88d..78fd2a91b4 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -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'];
 
+	// Same query in session.php
 	$sql = 'SELECT *
 		FROM ' . STYLES_IMAGESET_DATA_TABLE . '
 		WHERE imageset_id = ' . $theme['imageset_id'] . "
-		AND image_filename <> '' 
+		AND image_filename <> ''
 		AND image_lang IN ('" . $db->sql_escape($user_image_lang) . "', '')";
 	$result = $db->sql_query($sql, 3600);
 
@@ -257,11 +258,11 @@ if ($id)
 				case 'SRC':
 					$replace[] = $imgs[$img]['src'];
 				break;
-				
+
 				case 'WIDTH':
 					$replace[] = $imgs[$img]['width'];
 				break;
-	
+
 				case 'HEIGHT':
 					$replace[] = $imgs[$img]['height'];
 				break;