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

[Matthew Mullenweg]

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

Modified Files:
	index.php wp-blog-header.php 
Log Message:
Better default behaviour for theme calling

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** wp-blog-header.php	13 Feb 2005 20:32:24 -0000	1.121
--- wp-blog-header.php	13 Feb 2005 20:38:28 -0000	1.122
***************
*** 190,248 ****
  
  // 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() && empty($doing_rss) ) {
! 			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');
! 		if ( is_feed() && empty($doing_rss) ) {
! 			include(ABSPATH . '/wp-feed.php');
! 			exit;
! 		} else if ( is_trackback() ) {
! 			include(ABSPATH . '/wp-trackback.php');
! 			exit;
! 		} else if ( is_404() && get_404_template() ) {
! 			include(get_404_template());
! 			exit;
! 		} else if ( is_search() && get_search_template() ) {
! 			include(get_search_template());
! 			exit;
! 		} else if ( is_home() && get_home_template() ) {
! 			include(get_home_template());
! 			exit;
! 		} else if ( is_single() && get_single_template() ) {
! 			include(get_single_template());
! 			exit;
! 		} else if ( is_page() && get_page_template() ) {
! 			include(get_page_template());
! 			exit;
! 		} else if ( is_category() && get_category_template()) {
! 			include(get_category_template());
! 			exit;		
! 		} else if ( is_author() && get_author_template() ) {
! 			include(get_author_template());
! 			exit;
! 		} else if ( is_date() && get_date_template() ) {
! 			include(get_date_template());
! 			exit;
! 		} else if ( is_archive() && get_archive_template() ) {
! 			include(get_archive_template());
! 			exit;
! 		} else if ( is_paged() && get_paged_template() ) {
! 			include(get_paged_template());
! 			exit;
! 		} else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
! 			include(TEMPLATEPATH . "/index.php");
! 			exit;
! 		}
  	}
  }
--- 190,241 ----
  
  // Template redirection
! if ( defined('WP_USE_THEMES') && constant('WP_USE_THEMES') ) {
! 	do_action('template_redirect');
! 	if ( is_feed() && empty($doing_rss) ) {
! 		include(ABSPATH . '/wp-feed.php');
! 		exit;
! 	} else if ( is_trackback() ) {
! 		include(ABSPATH . '/wp-trackback.php');
! 		exit;
! 	}
! 	if ( is_feed() && empty($doing_rss) ) {
! 		include(ABSPATH . '/wp-feed.php');
! 		exit;
! 	} else if ( is_trackback() ) {
! 		include(ABSPATH . '/wp-trackback.php');
! 		exit;
! 	} else if ( is_404() && get_404_template() ) {
! 		include(get_404_template());
! 		exit;
! 	} else if ( is_search() && get_search_template() ) {
! 		include(get_search_template());
! 		exit;
! 	} else if ( is_home() && get_home_template() ) {
! 		include(get_home_template());
! 		exit;
! 	} else if ( is_single() && get_single_template() ) {
! 		include(get_single_template());
! 		exit;
! 	} else if ( is_page() && get_page_template() ) {
! 		include(get_page_template());
! 		exit;
! 	} else if ( is_category() && get_category_template()) {
! 		include(get_category_template());
! 		exit;		
! 	} else if ( is_author() && get_author_template() ) {
! 		include(get_author_template());
! 		exit;
! 	} else if ( is_date() && get_date_template() ) {
! 		include(get_date_template());
! 		exit;
! 	} else if ( is_archive() && get_archive_template() ) {
! 		include(get_archive_template());
! 		exit;
! 	} else if ( is_paged() && get_paged_template() ) {
! 		include(get_paged_template());
! 		exit;
! 	} else if ( file_exists(TEMPLATEPATH . "/index.php") ) {
! 		include(TEMPLATEPATH . "/index.php");
! 		exit;
  	}
  }

Index: index.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/index.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** index.php	2 Jan 2005 02:47:44 -0000	1.85
--- index.php	13 Feb 2005 20:38:28 -0000	1.86
***************
*** 1,4 ****
  <?php 
! /* Don't remove this line. */
  require('./wp-blog-header.php');
  ?>
\ No newline at end of file
--- 1,5 ----
  <?php 
! /* Short and sweet */
! define('WP_USE_THEMES', true);
  require('./wp-blog-header.php');
  ?>
\ No newline at end of file