[wp-cvs] wordpress wp-blog-header.php,1.100,1.101

[Ryan Boren]

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

Modified Files:
	wp-blog-header.php 
Log Message:
Give 404 precedence over other templates.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** wp-blog-header.php	10 Nov 2004 04:01:46 -0000	1.100
--- wp-blog-header.php	23 Nov 2004 21:16:04 -0000	1.101
***************
*** 211,214 ****
--- 211,219 ----
  			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")) {
***************
*** 251,259 ****
  			include("$wp_template_dir/search.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 (file_exists("$wp_template_dir/index.php"))
  			{
--- 256,259 ----