[wp-cvs] wordpress wp-blog-header.php, 1.65, 1.66 wp-feed.php, 1.2, 1.3 wp-trackback.php, 1.13, 1.14

[Ryan Boren]

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

Modified Files:
	wp-blog-header.php wp-feed.php wp-trackback.php 
Log Message:
index.php now handles feeds and trackbacks.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** wp-blog-header.php	24 May 2004 08:22:17 -0000	1.65
--- wp-blog-header.php	31 May 2004 23:35:32 -0000	1.66
***************
*** 69,72 ****
--- 69,79 ----
      }
  
+ if ($feed != '') {
+     $doing_rss = 1;
+ }
+ 
+ if ($tb == 1) {
+     $doing_trackback = 1;
+ }
  
  // Sending HTTP headers
***************
*** 161,164 ****
--- 168,181 ----
  }
  
+ if ($pagenow != 'wp-feed.php' && $feed != '') {
+     require(dirname(__FILE__) . '/wp-feed.php');
+     exit;
+ }
+ 
+ if ($pagenow != 'wp-trackback.php' && $tb == 1) {
+     require(dirname(__FILE__) . '/wp-trackback.php');
+     exit;
+ }
+ 
  if ($pagenow != 'post.php' && $pagenow != 'edit.php') {
      if ($use_gzipcompression) {

Index: wp-feed.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-feed.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wp-feed.php	6 Feb 2004 07:53:00 -0000	1.2
--- wp-feed.php	31 May 2004 23:35:32 -0000	1.3
***************
*** 1,7 ****
  <?php
  
! $blog = 1;
! $doing_rss = 1;
! require('wp-blog-header.php');
  
  if ($feed == '' || $feed == 'feed') {
--- 1,11 ----
  <?php
  
! if (! $doing_rss) {
!     $doing_rss = 1;
!     require('wp-blog-header.php');
! }
! 
! // Remove the pad, if present.
! $feed = preg_replace('/^_+/', '', $feed);
  
  if ($feed == '' || $feed == 'feed') {

Index: wp-trackback.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-trackback.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wp-trackback.php	24 May 2004 08:22:18 -0000	1.13
--- wp-trackback.php	31 May 2004 23:35:32 -0000	1.14
***************
*** 11,15 ****
  $blog_name = $_POST['blog_name'];
  
! require('wp-blog-header.php');
  
  if ( (($p != '') && ($p != 'all')) || ($name != '') ) {
--- 11,18 ----
  $blog_name = $_POST['blog_name'];
  
! if (! $doing_trackback) {
!     $doing_trackback = 1;
!     require('wp-blog-header.php');
! }
  
  if ( (($p != '') && ($p != 'all')) || ($name != '') ) {