[wp-cvs] wordpress wp-blog-header.php,1.108,1.109

[Ryan Boren]

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

Modified Files:
	wp-blog-header.php 
Log Message:
Rework query precedence for bug 541.  Add is_trackback().

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** wp-blog-header.php	8 Dec 2004 22:00:26 -0000	1.108
--- wp-blog-header.php	18 Dec 2004 00:28:23 -0000	1.109
***************
*** 108,112 ****
  }
  
! if (1 == $tb) {
      $doing_trackback = true;
  }
--- 108,112 ----
  }
  
! if (is_trackback()) {
      $doing_trackback = true;
  }
***************
*** 211,274 ****
  		do_action('template_redirect', '');
  		if (is_feed()) {
- 			$wp_did_template_redirect = true;
  			include(dirname(__FILE__) . '/wp-feed.php');
  			exit;
! 		} else if ($tb == 1) {
! 			$wp_did_template_redirect = true;
  			include(dirname(__FILE__) . '/wp-trackback.php');
  			exit;
  		} else if (is_404() &&
  							 file_exists("$wp_template_dir/404.php")) {
- 			$wp_did_template_redirect = true;
  			include("$wp_template_dir/404.php");
  			exit;
  		} else if (is_home() && 
  				file_exists("$wp_template_dir/index.php")) {
- 			$wp_did_template_redirect = true;
  			include("$wp_template_dir/index.php");
  			exit;
  		} else if (is_single() &&
  							 file_exists("$wp_template_dir/single.php")) {
- 			$wp_did_template_redirect = true;
  			include("$wp_template_dir/single.php");
  			exit;
  		} else if (is_page() && file_exists(get_page_template())) {
- 			$wp_did_template_redirect = true;
  			include(get_page_template());
  			exit;
  		} else if (is_category() &&
  							 file_exists("$wp_template_dir/category.php")) {
- 			$wp_did_template_redirect = true;
  			include("$wp_template_dir/category.php");
  			exit;
  		} else if (is_author() &&
  							 file_exists("$wp_template_dir/author.php")) {
- 			$wp_did_template_redirect = true;
  			include("$wp_template_dir/author.php");
  			exit;
  		} else if (is_date() &&
  							 file_exists("$wp_template_dir/date.php")) {
- 			$wp_did_date = true;
- 			$wp_did_template_redirect = true;
  			include("$wp_template_dir/date.php");
  			exit;
  		} else if (is_archive() &&
  							 file_exists("$wp_template_dir/archive.php")) {
- 			$wp_did_template_redirect = true;
  			include("$wp_template_dir/archive.php");
  			exit;
  		} else if (is_search() &&
  							 file_exists("$wp_template_dir/search.php")) {
- 			$wp_did_template_redirect = true;
  			include("$wp_template_dir/search.php");
  			exit;
  		} else if (is_paged() &&
  							 file_exists("$wp_template_dir/paged.php")) {
- 			$wp_did_template_redirect = true;
  			include("$wp_template_dir/paged.php");
  			exit;
  		} else if (file_exists("$wp_template_dir/index.php"))
  			{
- 				$wp_did_template_redirect = true;
  				include("$wp_template_dir/index.php");
  				exit;
--- 211,260 ----
  		do_action('template_redirect', '');
  		if (is_feed()) {
  			include(dirname(__FILE__) . '/wp-feed.php');
  			exit;
! 		} else if (is_trackback()) {
  			include(dirname(__FILE__) . '/wp-trackback.php');
  			exit;
  		} else if (is_404() &&
  							 file_exists("$wp_template_dir/404.php")) {
  			include("$wp_template_dir/404.php");
  			exit;
  		} else if (is_home() && 
  				file_exists("$wp_template_dir/index.php")) {
  			include("$wp_template_dir/index.php");
  			exit;
  		} else if (is_single() &&
  							 file_exists("$wp_template_dir/single.php")) {
  			include("$wp_template_dir/single.php");
  			exit;
  		} else if (is_page() && file_exists(get_page_template())) {
  			include(get_page_template());
  			exit;
  		} else if (is_category() &&
  							 file_exists("$wp_template_dir/category.php")) {
  			include("$wp_template_dir/category.php");
  			exit;
  		} else if (is_author() &&
  							 file_exists("$wp_template_dir/author.php")) {
  			include("$wp_template_dir/author.php");
  			exit;
  		} else if (is_date() &&
  							 file_exists("$wp_template_dir/date.php")) {
  			include("$wp_template_dir/date.php");
  			exit;
  		} else if (is_archive() &&
  							 file_exists("$wp_template_dir/archive.php")) {
  			include("$wp_template_dir/archive.php");
  			exit;
  		} else if (is_search() &&
  							 file_exists("$wp_template_dir/search.php")) {
  			include("$wp_template_dir/search.php");
  			exit;
  		} else if (is_paged() &&
  							 file_exists("$wp_template_dir/paged.php")) {
  			include("$wp_template_dir/paged.php");
  			exit;
  		} else if (file_exists("$wp_template_dir/index.php"))
  			{
  				include("$wp_template_dir/index.php");
  				exit;