[wp-cvs] wordpress wp-atom.php, 1.18, 1.19 wp-blog-header.php, 1.117, 1.118 wp-commentsrss2.php, 1.26, 1.27 wp-feed.php, 1.5, 1.6 wp-rdf.php, 1.24, 1.25 wp-rss.php, 1.23, 1.24 wp-rss2.php, 1.35, 1.36

[Ryan Boren]

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

Modified Files:
	wp-atom.php wp-blog-header.php wp-commentsrss2.php wp-feed.php 
	wp-rdf.php wp-rss.php wp-rss2.php 
Log Message:
Make sure is_feed() is true when feed files are referenced directly. http://mosquito.wordpress.org/view.php?id=726

Index: wp-rss2.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss2.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wp-rss2.php	11 Feb 2005 01:09:41 -0000	1.35
--- wp-rss2.php	11 Feb 2005 06:42:07 -0000	1.36
***************
*** 3,6 ****
--- 3,7 ----
  if (empty($feed)) {
  	$blog = 1;
+ 	$feed = 'rss2';
  	$doing_rss = 1;
  	require('wp-blog-header.php');

Index: wp-feed.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-feed.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wp-feed.php	27 Nov 2004 04:47:54 -0000	1.5
--- wp-feed.php	11 Feb 2005 06:42:07 -0000	1.6
***************
*** 10,14 ****
  
  if ($feed == '' || $feed == 'feed') {
-     // TODO:  Get default feed from options DB.
      $feed = 'rss2';
  }
--- 10,13 ----

Index: wp-atom.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-atom.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wp-atom.php	24 Jan 2005 07:33:50 -0000	1.18
--- wp-atom.php	11 Feb 2005 06:42:06 -0000	1.19
***************
*** 3,6 ****
--- 3,7 ----
  if (empty($feed)) {
      $blog = 1;
+ 		$feed = 'atom';
      $doing_rss = 1;
      require('wp-blog-header.php');

Index: wp-rss.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** wp-rss.php	24 Jan 2005 07:33:50 -0000	1.23
--- wp-rss.php	11 Feb 2005 06:42:07 -0000	1.24
***************
*** 3,6 ****
--- 3,7 ----
  if (empty($feed)) {
      $blog = 1;
+ 		$feed = 'rss';
      $doing_rss = 1;
      require('wp-blog-header.php');

Index: wp-commentsrss2.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-commentsrss2.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** wp-commentsrss2.php	11 Feb 2005 01:09:34 -0000	1.26
--- wp-commentsrss2.php	11 Feb 2005 06:42:07 -0000	1.27
***************
*** 1,5 ****
--- 1,7 ----
  <?php 
  if ( empty($feed) ) {
+ 	$feed = 'rss2';
  	$withcomments = 1;
+ 	$doing_rss = 1;
  	require('wp-blog-header.php');
  }

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** wp-blog-header.php	1 Feb 2005 06:43:31 -0000	1.117
--- wp-blog-header.php	11 Feb 2005 06:42:07 -0000	1.118
***************
*** 102,109 ****
  }
  
- if ( '' != $feed )
- 	$doing_rss = true;
- 
- 
  if ( is_trackback() )
  	$doing_trackback = true;
--- 102,105 ----
***************
*** 113,117 ****
  if ( is_404() ) {
  	header('HTTP/1.x 404 Not Found');
! } else if ( !isset($doing_rss) || !$doing_rss ) {
  	@header('X-Pingback: '. get_bloginfo('pingback_url'));
  } else {
--- 109,113 ----
  if ( is_404() ) {
  	header('HTTP/1.x 404 Not Found');
! } else if ( !is_feed() ) {
  	@header('X-Pingback: '. get_bloginfo('pingback_url'));
  } else {
***************
*** 208,212 ****
  		// should be skipped for everything except feeds and trackbacks.
  		$wp_template_redirect = true;
! 		if ( is_feed() ) {
  			include(ABSPATH . '/wp-feed.php');
  			exit;
--- 204,208 ----
  		// should be skipped for everything except feeds and trackbacks.
  		$wp_template_redirect = true;
! 		if ( is_feed() && empty($doing_rss) ) {
  			include(ABSPATH . '/wp-feed.php');
  			exit;
***************
*** 218,222 ****
  		$wp_template_redirect = true;
  		do_action('template_redirect');
! 		if ( is_feed() ) {
  			include(ABSPATH . '/wp-feed.php');
  			exit;
--- 214,218 ----
  		$wp_template_redirect = true;
  		do_action('template_redirect');
! 		if ( is_feed() && empty($doing_rss) ) {
  			include(ABSPATH . '/wp-feed.php');
  			exit;

Index: wp-rdf.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rdf.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** wp-rdf.php	7 Feb 2005 07:46:41 -0000	1.24
--- wp-rdf.php	11 Feb 2005 06:42:07 -0000	1.25
***************
*** 3,6 ****
--- 3,7 ----
  if (empty($feed)) {
      $blog = 1; // enter your blog's ID
+ 		$feed = 'rdf';
      $doing_rss = 1;
      require('wp-blog-header.php');