From 161996f06191e184c610aad851d606030fd7614c Mon Sep 17 00:00:00 2001
From: James Atkinson <thefinn@users.sourceforge.net>
Date: Thu, 29 Nov 2001 08:32:02 +0000
Subject: Dumped array_merge for code that should be php3 compatable

git-svn-id: file:///svn/phpbb/trunk@1471 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/admin/admin_styles.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'phpBB/admin')

diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php
index 98c8100c43..d743a54f39 100644
--- a/phpBB/admin/admin_styles.php
+++ b/phpBB/admin/admin_styles.php
@@ -464,6 +464,8 @@ switch($mode)
 				
 				$style_id = $HTTP_GET_VARS['style_id'];
 				
+				$selected_names = array();
+				$selected_values = array();
 				// 
 				// Fetch the Theme Info from the db
 				//
@@ -490,7 +492,22 @@ switch($mode)
 				
 				$selected_names = $db->sql_fetchrow($result);
 
-				$selected = array_merge($selected_values, $selected_names);
+				//$selected = array_merge($selected_values, $selected_names);
+				if(count($selected_values))
+				{
+					while(list($key, $val) = each($selected_values))
+					{
+						$selected[$key] = $val;
+					}
+				}
+
+				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 . '" />';
 			}
-- 
cgit v1.2.1