[wp-cvs] wordpress/wp-admin admin-functions.php, 1.74, 1.75 templates.php, 1.34, 1.35

[Ryan Boren]

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

Modified Files:
	admin-functions.php templates.php 
Log Message:
Include legacy template files in the common file list only if they exist.

Index: templates.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/templates.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** templates.php	27 Dec 2004 03:27:17 -0000	1.34
--- templates.php	19 Jan 2005 15:23:38 -0000	1.35
***************
*** 101,105 ****
  ?>
  <h3><?php _e('Common'); ?></h3>
! 	<?php $common_files = array('index.php', 'wp-layout.css', 'wp-comments.php', 'wp-comments-popup.php', '.htaccess', 'my-hacks.php'); ?>
    <ul>
  	 <?php foreach ($common_files as $common_file) : ?>
--- 101,110 ----
  ?>
  <h3><?php _e('Common'); ?></h3>
! 	<?php $common_files = array('index.php', '.htaccess', 'my-hacks.php');
!  $old_files = array('wp-layout.css', 'wp-comments.php', 'wp-comments-popup.php');
!  foreach ($old_files as $old_file) {
! 	 if (file_exists(ABSPATH . $old_file))
! 		 $common_files[] = $old_file;
!  } ?>
    <ul>
  	 <?php foreach ($common_files as $common_file) : ?>

Index: admin-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-functions.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** admin-functions.php	1 Jan 2005 23:05:05 -0000	1.74
--- admin-functions.php	19 Jan 2005 15:23:37 -0000	1.75
***************
*** 856,870 ****
  	array(
  	'index.php' => __('Main Template'),
- 	'wp-layout.css' => __('Stylesheet'),
  	'style.css' => __('Stylesheet'),
- 	'wp-comments.php' => __('Comments Template'),
  	'comments.php' => __('Comments Template'),
- 	'wp-comments-popup.php' => __('Popup Comments Template'),
  	'comments-popup.php' => __('Popup Comments Template'),
- 	'wp-footer.php' => __('Footer Template'),
  	'footer.php' => __('Footer Template'),
- 	'wp-header.php' => __('Header Template'),
  	'header.php' => __('Header Template'),
- 	'wp-sidebar.php' => __('Sidebar Template'),
  	'sidebar.php' => __('Sidebar Template'),
  	'archive.php' => __('Archive Template'),
--- 856,864 ----
***************
*** 875,879 ****
  	'404.php' => __('404 Template'),
  	'my-hacks.php' => __('my-hacks.php (legacy hacks support)'),
! 	'.htaccess' => __('.htaccess (for rewrite rules)')
  	);
  
--- 869,877 ----
  	'404.php' => __('404 Template'),
  	'my-hacks.php' => __('my-hacks.php (legacy hacks support)'),
! 	'.htaccess' => __('.htaccess (for rewrite rules)'),
! 	// Deprecated files
! 	'wp-layout.css' => __('Stylesheet'),
! 	'wp-comments.php' => __('Comments Template'),
! 	'wp-comments-popup.php' => __('Popup Comments Template')
  	);