[Phpbb-checkins] CVS: phpBB2/admin admin_styles.php,1.8,1.9

[James A. <th...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv13630

Modified Files:
	admin_styles.php 
Log Message:
Dumped array_merge for code that should be php3 compatable 


Index: admin_styles.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_styles.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** admin_styles.php	2001/11/24 01:51:35	1.8
--- admin_styles.php	2001/11/29 08:32:02	1.9
***************
*** 465,468 ****
--- 465,470 ----
  				$style_id = $HTTP_GET_VARS['style_id'];
  				
+ 				$selected_names = array();
+ 				$selected_values = array();
  				// 
  				// Fetch the Theme Info from the db
***************
*** 491,495 ****
  				$selected_names = $db->sql_fetchrow($result);
  
! 				$selected = array_merge($selected_values, $selected_names);
  				
  				$s_hidden_fields = '<input type="hidden" name="style_id" value="' . $style_id . '" />';
--- 493,512 ----
  				$selected_names = $db->sql_fetchrow($result);
  
! 				//$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 . '" />';