[wp-cvs] wordpress/wp-includes classes.php,1.58,1.59

[Ryan Boren]

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

Modified Files:
	classes.php 
Log Message:
Use the object's is_* vars instead of the global is_* functions.

Index: classes.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** classes.php	13 Feb 2005 19:42:22 -0000	1.58
--- classes.php	13 Feb 2005 19:45:04 -0000	1.59
***************
*** 236,240 ****
  			$q['posts_per_page'] = $q['showposts'];
  		}
! 		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && (is_archive() || is_search()) )
  			$q['posts_per_page'] = $q['posts_per_archive_page'];
  		if ( !isset($q['nopaging']) ) {
--- 236,240 ----
  			$q['posts_per_page'] = $q['showposts'];
  		}
! 		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
  			$q['posts_per_page'] = $q['posts_per_archive_page'];
  		if ( !isset($q['nopaging']) ) {
***************
*** 356,360 ****
  		if ((empty($q['cat'])) || ($q['cat'] == '0') || 
  				// Bypass cat checks if fetching specific posts
! 				( is_single() || is_page() )) {
  			$whichcat='';
  		} else {
--- 356,360 ----
  		if ((empty($q['cat'])) || ($q['cat'] == '0') || 
  				// Bypass cat checks if fetching specific posts
! 				( $this->is_single || $this->is_page )) {
  			$whichcat='';
  		} else {
***************
*** 483,487 ****
  		}
  
! 		if (is_page()) {
  			$where .= ' AND (post_status = "static"';
  		} else {
--- 483,487 ----
  		}
  
! 		if ($this->is_page) {
  			$where .= ' AND (post_status = "static"';
  		} else {
***************
*** 501,505 ****
  
  		// Paging
! 		if (empty($q['nopaging']) && ! is_single()) {
  			$page = $q['paged'];
  			if (empty($page)) {
--- 501,505 ----
  
  		// Paging
! 		if (empty($q['nopaging']) && ! $this->is_single) {
  			$page = $q['paged'];
  			if (empty($page)) {