[wp-cvs] wordpress/wp-includes classes.php,1.1,1.2

[Ryan Boren]

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

Modified Files:
	classes.php 
Log Message:
Fix for 0000190.  Do not set the category query state to true if single, date, or search are true.

Index: classes.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** classes.php	30 Jun 2004 15:31:49 -0000	1.1
--- classes.php	28 Jul 2004 01:59:29 -0000	1.2
***************
*** 26,29 ****
--- 26,37 ----
          $this->init();
  
+         if ('' != $name) {
+             $this->single = true;
+         }
+ 
+         if (($p != '') && ($p != 'all')) {
+             $this->single = true;
+         }
+ 
          if ('' != $m) {
              $this->date = true;
***************
*** 58,80 ****
          }
  
-         if ('' != $name) {
-             $this->single = true;
-         }
- 
-         if (($p != '') && ($p != 'all')) {
-             $this->single = true;
-         }
- 
          if (!empty($s)) {
              $this->search = true;
          }
  
!         if ((empty($cat)) || ($cat == 'all') || ($cat == '0') || 
!             // Bypass cat checks if fetching specific posts
!             (
!              intval($year) || intval($monthnum) || intval($day) || intval($w) ||
!              intval($p) || !empty($name) || !empty($s)
!              )
!             ) {
              $this->category = false;
          } else {
--- 66,74 ----
          }
  
          if (!empty($s)) {
              $this->search = true;
          }
  
!         if (empty($cat) || ($cat == 'all') || ($cat == '0')) {
              $this->category = false;
          } else {
***************
*** 89,92 ****
--- 83,91 ----
              $this->category = true;
          }
+             
+         // single, date, and search override category.
+         if ($this->single || $this->date || $this->search) {
+             $this->category = false;                
+         }
  
          if ((empty($author)) || ($author == 'all') || ($author == '0')) {