[wp-cvs] wordpress wp-feed.php,1.3,1.4 wp-trackback.php,1.19,1.20

[Ryan Boren]

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

Modified Files:
	wp-feed.php wp-trackback.php 
Log Message:
Trackback fix ups.

Index: wp-feed.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-feed.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wp-feed.php	31 May 2004 23:35:32 -0000	1.3
--- wp-feed.php	18 Sep 2004 22:47:42 -0000	1.4
***************
*** 14,18 ****
  }
  
! if ( (($p != '') && ($p != 'all')) || ($name != '') || ($withcomments == 1) ) {
      require('wp-commentsrss2.php');
  } else {
--- 14,18 ----
  }
  
! if ( is_single() || ($withcomments == 1) ) {
      require('wp-commentsrss2.php');
  } else {

Index: wp-trackback.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-trackback.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wp-trackback.php	7 Sep 2004 02:34:12 -0000	1.19
--- wp-trackback.php	18 Sep 2004 22:47:42 -0000	1.20
***************
*** 1,5 ****
  <?php
! $doing_trackback = 1;
! require('./wp-config.php');
  include_once (ABSPATH . WPINC . '/functions-post.php');
  
--- 1,9 ----
  <?php
! 
! if ( !$doing_trackback) {
!     $doing_trackback = 1;
!     require('wp-blog-header.php');
! }
! 
  include_once (ABSPATH . WPINC . '/functions-post.php');
  
***************
*** 32,40 ****
  $blog_name = $_POST['blog_name'];
  
- if ( !$doing_trackback) {
-     $doing_trackback = 1;
-     require('./wp-blog-header.php');
- }
- 
  if ( is_single() ) 
      $tb_id = $posts[0]->ID;
--- 36,39 ----