[wp-cvs] wordpress wp-blog-header.php,1.111,1.112

[Ryan Boren]

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

Modified Files:
	wp-blog-header.php 
Log Message:
If template redirection is turned off, we still need to redirect for feeds and trackbacks so that permalinks do not break.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** wp-blog-header.php	9 Jan 2005 01:53:31 -0000	1.111
--- wp-blog-header.php	14 Jan 2005 05:52:10 -0000	1.112
***************
*** 206,210 ****
  // Template redirection
  if ($pagenow == 'index.php') {
! 	if ( !isset($wp_template_redirect) ) {
  		$wp_template_redirect = true;
  		do_action('template_redirect', '');
--- 206,221 ----
  // Template redirection
  if ($pagenow == 'index.php') {
! 	if ( isset($wp_template_redirect) && $wp_template_redirect != true) {
! 		// If $wp_template_redirect is set to false, template redirection
! 		// should be skipped for everything except feeds and trackbacks.
! 		$wp_template_redirect = true;
! 		if ( is_feed() ) {
! 			include(ABSPATH . '/wp-feed.php');
! 			exit;
! 		} else if ( is_trackback() ) {
! 			include(ABSPATH . '/wp-trackback.php');
! 			exit;
! 		}
! 	} elseif ( !isset($wp_template_redirect) ) {
  		$wp_template_redirect = true;
  		do_action('template_redirect', '');