[wp-cvs] wordpress wp-blog-header.php, 1.95, 1.96 wp-commentsrss2.php, 1.20, 1.21

[Matthew Mullenweg]

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

Modified Files:
	wp-blog-header.php wp-commentsrss2.php 
Log Message:
Fix for bug 137. Patch from kelson.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** wp-blog-header.php	8 Oct 2004 08:06:20 -0000	1.95
--- wp-blog-header.php	14 Oct 2004 08:27:55 -0000	1.96
***************
*** 115,122 ****
  } else {
  	// We're showing a feed, so WP is indeed the only thing that last changed
! 	$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
  	$wp_etag = '"' . md5($wp_last_modified) . '"';
! 	@header('Last-Modified: '.$wp_last_modified);
! 	@header('ETag: '.$wp_etag);
  	@header ('X-Pingback: ' . get_bloginfo('pingback_url'));
  
--- 115,125 ----
  } else {
  	// We're showing a feed, so WP is indeed the only thing that last changed
! 	if ( $withcomments )
! 		$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
! 	else 
! 		$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
  	$wp_etag = '"' . md5($wp_last_modified) . '"';
! 	@header("Last-Modified: $wp_last_modified");
! 	@header("ETag: $wp_etag");
  	@header ('X-Pingback: ' . get_bloginfo('pingback_url'));
  

Index: wp-commentsrss2.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-commentsrss2.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wp-commentsrss2.php	10 Oct 2004 18:41:39 -0000	1.20
--- wp-commentsrss2.php	14 Oct 2004 08:27:55 -0000	1.21
***************
*** 1,4 ****
  <?php 
! if (! $feed) {
      require('wp-blog-header.php');
  }
--- 1,5 ----
  <?php 
! if ( !$feed ) {
! 	$withcomments = 1;
      require('wp-blog-header.php');
  }