From c3801d4d3a06855020237d80f4208fb39ec75322 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Tue, 19 Mar 2002 00:25:03 +0000
Subject: [PATCH] Fix 'each' warning, bug #528254

git-svn-id: file:///svn/phpbb/trunk@2332 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/admin/admin_styles.php | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php
index 75ac5d318d..0d15d94983 100644
--- a/phpBB/admin/admin_styles.php
+++ b/phpBB/admin/admin_styles.php
@@ -504,7 +504,13 @@ switch( $mode )
 					message_die(GENERAL_ERROR, "Could not get data from themes table", "", __LINE__, __FILE__, $sql);
 				}
 				
-				$selected_values = $db->sql_fetchrow($result);
+				if ( $selected_values = $db->sql_fetchrow($result) )
+				{
+					while(list($key, $val) = @each($selected_values))
+					{
+						$selected[$key] = $val;
+					}
+				}
 				
 				//
 				// Fetch the Themes Name data
@@ -517,27 +523,14 @@ switch( $mode )
 					message_die(GENERAL_ERROR, "Could not get data from themes name table", "", __LINE__, __FILE__, $sql);
 				}
 				
-				$selected_names = $db->sql_fetchrow($result);
-
-				reset($selected_values);
-				//$selected = array_merge($selected_values, $selected_names);
-				if(count($selected_values))
+				if ( $selected_names = $db->sql_fetchrow($result) )
 				{
-					while(list($key, $val) = each($selected_values))
+					while(list($key, $val) = @each($selected_names))
 					{
 						$selected[$key] = $val;
 					}
 				}
 
-				reset($selected_names);
-				if($selected_names)
-				{
-					while(list($key, $val) = each($selected_names))
-					{
-						$selected[$key] = $val;
-					}
-				}
-				
 				$s_hidden_fields = '<input type="hidden" name="style_id" value="' . $style_id . '" />';
 			}
 			else