[wp-cvs] wordpress wp-blog-header.php,1.85,1.86

[Ryan Boren]

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

Modified Files:
	wp-blog-header.php 
Log Message:
Template redirection fix-up.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** wp-blog-header.php	11 Sep 2004 16:12:28 -0000	1.85
--- wp-blog-header.php	13 Sep 2004 07:28:16 -0000	1.86
***************
*** 206,209 ****
--- 206,210 ----
      file_exists(ABSPATH . "wp-content/${wp_template}index.php")) {
    $wp_did_home = true;
+ 	$wp_did_template_redirect = true;
    include(ABSPATH . "wp-content/${wp_template}index.php");
    exit;
***************
*** 211,214 ****
--- 212,216 ----
      file_exists(ABSPATH . "wp-content/${wp_template}single.php")) {
    $wp_did_single = true;
+ 	$wp_did_template_redirect = true;
    include(ABSPATH . "wp-content/${wp_template}single.php");
    exit;
***************
*** 216,219 ****
--- 218,222 ----
  	    file_exists(ABSPATH . "wp-content/${wp_template}page.php")) {
    $wp_did_page = true;
+ 	$wp_did_template_redirect = true;
    include(ABSPATH . "wp-content/${wp_template}page.php");
    exit;
***************
*** 221,224 ****
--- 224,228 ----
  	   file_exists(ABSPATH . "wp-content/${wp_template}category.php")) {
    $wp_did_category = true;
+ 	$wp_did_template_redirect = true;
    include(ABSPATH . "wp-content/${wp_template}category.php");
    exit;
***************
*** 226,229 ****
--- 230,234 ----
  	   file_exists(ABSPATH . "wp-content/${wp_template}author.php")) {
    $wp_did_author = true;
+ 	$wp_did_template_redirect = true;
    include(ABSPATH . "wp-content/${wp_template}author.php");
    exit;
***************
*** 231,234 ****
--- 236,240 ----
  	   file_exists(ABSPATH . "wp-content/${wp_template}date.php")) {
    $wp_did_date = true;
+ 	$wp_did_template_redirect = true;
    include(ABSPATH . "wp-content/${wp_template}date.php");
    exit;
***************
*** 236,239 ****
--- 242,246 ----
  	   file_exists(ABSPATH . "wp-content/${wp_template}archive.php")) {
    $wp_did_archive = true;
+ 	$wp_did_template_redirect = true;
    include(ABSPATH . "wp-content/${wp_template}archive.php");
    exit;
***************
*** 241,244 ****
--- 248,252 ----
  	   file_exists(ABSPATH . "wp-content/${wp_template}search.php")) {
    $wp_did_search = true;
+ 	$wp_did_template_redirect = true;
    include(ABSPATH . "wp-content/${wp_template}search.php");
    exit;
***************
*** 246,260 ****
  	   file_exists(ABSPATH . "wp-content/${wp_template}404.php")) {
    $wp_did_404 = true;
    include(ABSPATH . "wp-content/${wp_template}404.php");
    exit;
  } else if (is_feed() && $pagenow != 'wp-feed.php') {
    include(dirname(__FILE__) . '/wp-feed.php');
    exit;
  } else if ($pagenow != 'wp-trackback.php' && $tb == 1) {
    include(dirname(__FILE__) . '/wp-trackback.php');
    exit;
! } else if ((! isset($wp_did_home)) && file_exists(ABSPATH . "wp-content/${wp_template}index.php"))
  {
  	$wp_did_home = true;
  	include(ABSPATH . "wp-content/${wp_template}index.php");
  	exit;
--- 254,272 ----
  	   file_exists(ABSPATH . "wp-content/${wp_template}404.php")) {
    $wp_did_404 = true;
+ 	$wp_did_template_redirect = true;
    include(ABSPATH . "wp-content/${wp_template}404.php");
    exit;
  } else if (is_feed() && $pagenow != 'wp-feed.php') {
+ 	$wp_did_template_redirect = true;
    include(dirname(__FILE__) . '/wp-feed.php');
    exit;
  } else if ($pagenow != 'wp-trackback.php' && $tb == 1) {
+ 	$wp_did_template_redirect = true;
    include(dirname(__FILE__) . '/wp-trackback.php');
    exit;
! } else if ((! isset($wp_did_template_redirect)) && file_exists(ABSPATH . "wp-content/${wp_template}index.php"))
  {
  	$wp_did_home = true;
+ 	$wp_did_template_redirect = true;
  	include(ABSPATH . "wp-content/${wp_template}index.php");
  	exit;