[wp-cvs] wordpress wp-blog-header.php, 1.106, 1.107 wp-footer.php, 1.4, 1.5 wp-header.php, 1.5, 1.6 wp-settings.php, 1.61, 1.62 wp-sidebar.php, 1.1, 1.2

[Ryan Boren]

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

Modified Files:
	wp-blog-header.php wp-footer.php wp-header.php wp-settings.php 
	wp-sidebar.php 
Log Message:
Define TEMPLATEPATH.  Look for footer, sidebar, and header in the template directory for the active theme.

Index: wp-footer.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-footer.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wp-footer.php	8 Sep 2004 09:53:20 -0000	1.4
--- wp-footer.php	8 Dec 2004 21:51:25 -0000	1.5
***************
*** 2,7 ****
  // If a footer.php file exists in the WP root directory we
  // use that, otherwise use this default wp-footer.php file.
! if ( file_exists(ABSPATH . '/footer.php') ) :
! 	include_once(ABSPATH . '/footer.php');
  else :
  ?>
--- 2,7 ----
  // If a footer.php file exists in the WP root directory we
  // use that, otherwise use this default wp-footer.php file.
! if ( file_exists(TEMPLATEPATH . '/footer.php') ) :
! 	include_once(TEMPLATEPATH . '/footer.php');
  else :
  ?>

Index: wp-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-header.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wp-header.php	8 Oct 2004 17:58:02 -0000	1.5
--- wp-header.php	8 Dec 2004 21:51:25 -0000	1.6
***************
*** 2,7 ****
  // If a header.php file exists in the WP root directory we
  // use that, otherwise use this default wp-header.php file.
! if ( file_exists(ABSPATH . '/header.php') ) :
! 	include_once(ABSPATH . '/header.php');
  else :
  ?>
--- 2,7 ----
  // If a header.php file exists in the WP root directory we
  // use that, otherwise use this default wp-header.php file.
! if ( file_exists(TEMPLATEPATH . '/header.php') ) :
! 	include_once(TEMPLATEPATH . '/header.php');
  else :
  ?>

Index: wp-settings.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-settings.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** wp-settings.php	26 Oct 2004 04:03:34 -0000	1.61
--- wp-settings.php	8 Dec 2004 21:51:25 -0000	1.62
***************
*** 97,100 ****
--- 97,102 ----
  }
  
+ define('TEMPLATEPATH', get_template_directory());
+ 
  function shutdown_action_hook() {
  	do_action('shutdown', '');

Index: wp-sidebar.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-sidebar.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wp-sidebar.php	8 Sep 2004 09:53:20 -0000	1.1
--- wp-sidebar.php	8 Dec 2004 21:51:25 -0000	1.2
***************
*** 2,7 ****
  // If a sidebar.php file exists in the WP root directory we
  // use that, otherwise use this default wp-sidebar.php file.
! if ( file_exists(ABSPATH . '/sidebar.php') ) :
! 	include_once(ABSPATH . '/sidebar.php');
  else :
  ?>
--- 2,7 ----
  // If a sidebar.php file exists in the WP root directory we
  // use that, otherwise use this default wp-sidebar.php file.
! if ( file_exists(TEMPLATEPATH . '/sidebar.php') ) :
! 	include_once(TEMPLATEPATH . '/sidebar.php');
  else :
  ?>

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** wp-blog-header.php	8 Dec 2004 00:22:49 -0000	1.106
--- wp-blog-header.php	8 Dec 2004 21:51:25 -0000	1.107
***************
*** 203,207 ****
  endif;
  
! $wp_template_dir = get_template_directory();
  
  // Template redirection
--- 203,207 ----
  endif;
  
! $wp_template_dir = TEMPLATEPATH;
  
  // Template redirection