From 6eec3bcf65adca40444cae52354b2f1569a6902c Mon Sep 17 00:00:00 2001
From: David M <davidmj@users.sourceforge.net>
Date: Wed, 25 Apr 2007 23:27:10 +0000
Subject: #10127

git-svn-id: file:///svn/phpbb/trunk@7402 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/acp/acp_styles.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/acp/acp_styles.php')

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 3f27d3b907..ee7055b2f5 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -411,7 +411,7 @@ parse_css_file = {PARSE_CSS_FILE}
 									$image_name = substr($image_name, 4);
 									if (in_array($image_name, $imageset_definitions))
 									{
-										$sql_ary = array(
+										$sql_ary[] = array(
 											'image_name'		=> $image_name,
 											'image_filename'	=> $image_filename,
 											'image_height'		=> (int) $image_height,
@@ -419,7 +419,6 @@ parse_css_file = {PARSE_CSS_FILE}
 											'imageset_id'		=> $style_id,
 											'image_lang'		=> '',
 										);
-										$db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
 									}
 								}
 							}
@@ -458,7 +457,7 @@ parse_css_file = {PARSE_CSS_FILE}
 											$image_name = substr($image_name, 4);
 											if (in_array($image_name, $imageset_definitions))
 											{
-												$sql_ary = array(
+												$sql_ary[] = array(
 													'image_name'		=> $image_name,
 													'image_filename'	=> $image_filename,
 													'image_height'		=> $image_height,
@@ -466,7 +465,6 @@ parse_css_file = {PARSE_CSS_FILE}
 													'imageset_id'		=> $style_id,
 													'image_lang'		=> $row['lang_dir'],
 												);
-												$db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
 											}
 										}
 									}
@@ -474,6 +472,8 @@ parse_css_file = {PARSE_CSS_FILE}
 							}
 							$db->sql_freeresult($result);
 
+							$db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary);
+
 							$db->sql_transaction('commit');
 
 							$cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE);
@@ -1606,7 +1606,7 @@ parse_css_file = {PARSE_CSS_FILE}
 					foreach ($langs as $language)
 					{
 						$template->assign_block_vars('category.images', array(
-							'SELECTED'			=> ($img == $imgname),
+							'SELECTED'			=> ($img == $imgname && $language == $imgnamelang),
 							'VALUE'				=> $img . '-' . $language,
 							'TEXT'				=> $user->lang['IMG_' . strtoupper($img)] . ' [ ' . $language . ' ]'
 						));
-- 
cgit v1.2.1