[wp-cvs] wordpress/wp-admin theme-editor.php,1.6,1.7

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12309

Modified Files:
	theme-editor.php 
Log Message:
Fix array_merge of stylesheets and templates.  Patch from kharris.

Index: theme-editor.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/theme-editor.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** theme-editor.php	17 Nov 2004 03:20:32 -0000	1.6
--- theme-editor.php	23 Nov 2004 17:51:34 -0000	1.7
***************
*** 27,31 ****
  }
  
! $allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $allowed_files, $themes[$theme]['Template Files']);
  
  if (empty($file)) {
--- 27,31 ----
  }
  
! $allowed_files = array_merge($themes[$theme]['Stylesheet Files'], $themes[$theme]['Template Files']);
  
  if (empty($file)) {