[wp-cvs] wordpress/wp-includes classes.php, 1.17, 1.18 template-functions-general.php, 1.44, 1.45

[Ryan Boren]

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

Modified Files:
	classes.php template-functions-general.php 
Log Message:
Use get_query_var() to get cat and name so that we pick up any processing done on them by the query.

Index: template-functions-general.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-general.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** template-functions-general.php	5 Sep 2004 00:24:28 -0000	1.44
--- template-functions-general.php	9 Sep 2004 03:45:51 -0000	1.45
***************
*** 99,103 ****
  function wp_title($sep = '»', $display = true) {
      global $wpdb;
!     global $m, $year, $monthnum, $day, $cat, $category_name, $p, $name, $month, $posts;
  
      // If there's a category
--- 99,108 ----
  function wp_title($sep = '»', $display = true) {
      global $wpdb;
!     global $m, $year, $monthnum, $day, $category_name, $month, $posts;
! 
! 		$cat = get_query_var('cat');
! 		$p = get_query_var('p');
! 		$name = get_query_var('name');
! 		$category_name = get_query_var('category_name');
  
      // If there's a category
***************
*** 151,155 ****
  
  function single_post_title($prefix = '', $display = true) {
!     global $p, $name, $wpdb;
      if (intval($p) || '' != $name) {
          if (!$p) {
--- 156,162 ----
  
  function single_post_title($prefix = '', $display = true) {
!     global $wpdb;
! 		$p = get_query_var('p');
! 		$name = get_query_var('name');
      if (intval($p) || '' != $name) {
          if (!$p) {
***************
*** 168,172 ****
  
  function single_cat_title($prefix = '', $display = true ) {
!     global $cat;
      if(!empty($cat) && !(strtoupper($cat) == 'ALL')) {
          $my_cat_name = get_the_category_by_ID($cat);
--- 175,179 ----
  
  function single_cat_title($prefix = '', $display = true ) {
! 	  $cat = get_query_var('cat');
      if(!empty($cat) && !(strtoupper($cat) == 'ALL')) {
          $my_cat_name = get_the_category_by_ID($cat);

Index: classes.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** classes.php	8 Sep 2004 08:17:53 -0000	1.17
--- classes.php	9 Sep 2004 03:45:51 -0000	1.18
***************
*** 525,528 ****
--- 525,531 ----
  
  		update_post_caches($this->posts);
+ 		
+ 		// Save any changes made to the query vars.
+ 		$this->query_vars = $q;
  		return $this->posts;
  	}