[wp-cvs] wordpress/wp-admin admin-functions.php, 1.83, 1.84 upgrade-functions.php, 1.92, 1.93

[Matthew Mullenweg]

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

Modified Files:
	admin-functions.php upgrade-functions.php 
Log Message:
Two small tweaks before release

Index: admin-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-functions.php,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** admin-functions.php	14 Feb 2005 07:04:16 -0000	1.83
--- admin-functions.php	15 Feb 2005 03:32:43 -0000	1.84
***************
*** 905,909 ****
  	if ( isset($wp_file_descriptions[basename($file)] ) ) {
  		return $wp_file_descriptions[basename($file)];
! 	} else {
  		$template_data = implode('', file(ABSPATH . $file));
  		if ( preg_match("|Template Name:(.*)|i", $template_data, $name) )
--- 905,909 ----
  	if ( isset($wp_file_descriptions[basename($file)] ) ) {
  		return $wp_file_descriptions[basename($file)];
! 	} elseif ( file_exists( ABSPATH . $file ) ) {
  		$template_data = implode('', file(ABSPATH . $file));
  		if ( preg_match("|Template Name:(.*)|i", $template_data, $name) )

Index: upgrade-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-functions.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** upgrade-functions.php	14 Feb 2005 09:17:20 -0000	1.92
--- upgrade-functions.php	15 Feb 2005 03:32:43 -0000	1.93
***************
*** 544,547 ****
--- 544,556 ----
  			$oldpath = ABSPATH;
  
+ 		if ($oldfile == 'index.php') { // Check to make sure it's not a new index
+ 			$index = implode('', file("$oldpath/$oldfile"));
+ 			if ( strstr( $index, 'WP_USE_THEMES' ) ) {
+ 				if (! @copy(ABSPATH . 'wp-content/themes/default/index.php', "$site_dir/$newfile"))
+ 					return false;
+ 				continue; // Don't copy anything
+ 				}
+ 		}
+ 
  		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
  			return false;
***************
*** 571,575 ****
  
  	// Add a theme header.
! 	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . get_option('siteurl') . "\nDescription: Your theme.\nVersion: 1\nAuthor: You\n*/\n";
  
  	$stylelines = file_get_contents("$site_dir/style.css");
--- 580,584 ----
  
  	// Add a theme header.
! 	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . get_option('siteurl') . "\nDescription: A theme automatically created by the upgrade.\nVersion: 1.0\nAuthor: Moi\n*/\n";
  
  	$stylelines = file_get_contents("$site_dir/style.css");