[wp-cvs] wordpress wp-blog-header.php,1.92,1.93

[Ryan Boren]

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

Modified Files:
	wp-blog-header.php 
Log Message:
Introduce get_template_directory() and bloginfo('stylesheet_directory').  Make comments_popup_script() theme aware.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** wp-blog-header.php	19 Sep 2004 04:19:16 -0000	1.92
--- wp-blog-header.php	30 Sep 2004 17:56:16 -0000	1.93
***************
*** 193,205 ****
  endif;
  
! $wp_template = get_settings('template');
! 
! if ($wp_template == 'default') {
!   $wp_template = '';
! }
! 
! if (! empty($wp_template)) {
!   $wp_template = "themes/$wp_template/";
! }
  
  // Template redirection
--- 193,197 ----
  endif;
  
! $wp_template_dir = get_template_directory();
  
  // Template redirection
***************
*** 215,267 ****
  			exit;
  		} else if (is_home() && 
! 				file_exists(ABSPATH . "wp-content/${wp_template}index.php")) {
  			$wp_did_template_redirect = true;
! 			include(ABSPATH . "wp-content/${wp_template}index.php");
  			exit;
  		} else if (is_single() &&
! 							 file_exists(ABSPATH . "wp-content/${wp_template}single.php")) {
  			$wp_did_template_redirect = true;
! 			include(ABSPATH . "wp-content/${wp_template}single.php");
  			exit;
  		} else if (is_page() &&
! 							 file_exists(ABSPATH . "wp-content/${wp_template}page.php")) {
  			$wp_did_template_redirect = true;
! 			include(ABSPATH . "wp-content/${wp_template}page.php");
  			exit;
  		} else if (is_category() &&
! 							 file_exists(ABSPATH . "wp-content/${wp_template}category.php")) {
  			$wp_did_template_redirect = true;
! 			include(ABSPATH . "wp-content/${wp_template}category.php");
  			exit;
  		} else if (is_author() &&
! 							 file_exists(ABSPATH . "wp-content/${wp_template}author.php")) {
  			$wp_did_template_redirect = true;
! 			include(ABSPATH . "wp-content/${wp_template}author.php");
  			exit;
  		} else if (is_date() &&
! 							 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;
  		} else if (is_archive() &&
! 							 file_exists(ABSPATH . "wp-content/${wp_template}archive.php")) {
  			$wp_did_template_redirect = true;
! 			include(ABSPATH . "wp-content/${wp_template}archive.php");
  			exit;
  		} else if (is_search() &&
! 							 file_exists(ABSPATH . "wp-content/${wp_template}search.php")) {
  			$wp_did_template_redirect = true;
! 			include(ABSPATH . "wp-content/${wp_template}search.php");
  			exit;
  		} else if (is_404() &&
! 							 file_exists(ABSPATH . "wp-content/${wp_template}404.php")) {
  			$wp_did_template_redirect = true;
! 			include(ABSPATH . "wp-content/${wp_template}404.php");
  			exit;
! 		} else if (file_exists(ABSPATH . "wp-content/${wp_template}index.php"))
  			{
  				$wp_did_template_redirect = true;
! 				include(ABSPATH . "wp-content/${wp_template}index.php");
  				exit;
  			}
--- 207,259 ----
  			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("$wp_template_dir/page.php")) {
  			$wp_did_template_redirect = true;
! 			include("$wp_template_dir/page.php");
  			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_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"))
  			{
  				$wp_did_template_redirect = true;
! 				include("$wp_template_dir/index.php");
  				exit;
  			}