[wp-cvs] wordpress wp-blog-header.php,1.120,1.121

[Ryan Boren]

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

Modified Files:
	wp-blog-header.php 
Log Message:
Don't redirect to permalink page if search returns one result.  Move search template load higher up in load order.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** wp-blog-header.php	13 Feb 2005 20:01:41 -0000	1.120
--- wp-blog-header.php	13 Feb 2005 20:32:24 -0000	1.121
***************
*** 167,177 ****
  
  if (1 == count($posts)) {
! 	if (is_single()) {
! 		$more = 1;
! 		$single = 1;
! 	}
! 	if ( $s && empty($paged) && !strstr($_SERVER['PHP_SELF'], 'wp-admin/')) { // If they were doing a search and got one result
! 		header('Location: ' . get_permalink($posts[0]->ID));
! 	}
  }
  
--- 167,172 ----
  
  if (1 == count($posts)) {
! 	$more = 1;
! 	$single = 1;
  }
  
***************
*** 219,222 ****
--- 214,220 ----
  			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());
***************
*** 240,246 ****
  			include(get_archive_template());
  			exit;
- 		} else if ( is_search() && get_search_template() ) {
- 			include(get_search_template());
- 			exit;
  		} else if ( is_paged() && get_paged_template() ) {
  			include(get_paged_template());
--- 238,241 ----