[wp-cvs] wordpress wp-blog-header.php, 1.123, 1.124 wp-trackback.php, 1.30, 1.31

[Ryan Boren]

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

Modified Files:
	wp-blog-header.php wp-trackback.php 
Log Message:
Make sure trackback template is not double processed.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** wp-blog-header.php	13 Feb 2005 21:20:00 -0000	1.123
--- wp-blog-header.php	13 Feb 2005 21:25:08 -0000	1.124
***************
*** 183,189 ****
  }
  
- if ( is_trackback() )
- 	$doing_trackback = true;
- 
  // Template redirection
  if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
--- 183,186 ----
***************
*** 192,196 ****
  		include(ABSPATH . '/wp-feed.php');
  		exit;
! 	} else if ( is_trackback() ) {
  		include(ABSPATH . '/wp-trackback.php');
  		exit;
--- 189,193 ----
  		include(ABSPATH . '/wp-feed.php');
  		exit;
! 	} else if ( is_trackback() && empty($doing_trackback) ) {
  		include(ABSPATH . '/wp-trackback.php');
  		exit;
***************
*** 234,238 ****
  		include(ABSPATH . '/wp-feed.php');
  		exit;
! 	} else if ( is_trackback() ) {
  		include(ABSPATH . '/wp-trackback.php');
  		exit;
--- 231,235 ----
  		include(ABSPATH . '/wp-feed.php');
  		exit;
! 	} else if ( is_trackback() && empty($doing_trackback) ) {
  		include(ABSPATH . '/wp-trackback.php');
  		exit;

Index: wp-trackback.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-trackback.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wp-trackback.php	12 Feb 2005 07:30:21 -0000	1.30
--- wp-trackback.php	13 Feb 2005 21:25:08 -0000	1.31
***************
*** 4,7 ****
--- 4,8 ----
  if ( empty($doing_trackback) ) {
  	$doing_trackback = true;
+ 	$tb = true;
  	require_once('wp-blog-header.php');
  }