Changeset 1490

Timestamp:

07/28/2004 01:59:29 AM (21 years ago)

Author:

rboren

Message:

Fix for 0000190. Do not set the category query state to true if single, date, or search are true.

File:

• trunk/wp-includes/classes.php (modified) (3 diffs)

trunk/wp-includes/classes.php

@@ -25 +25 @@
         parse_str($query);
         $this->init();
+
+        if ('' != $name) {
+            $this->single = true;
+        }
+
+        if (($p != '') && ($p != 'all')) {
+            $this->single = true;
+        }
 
         if ('' != $m) {
@@ -58 +66 @@
         }
 
-        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)
-             )
-            ) {
+        if (empty($cat) || ($cat == 'all') || ($cat == '0')) {
             $this->category = false;
         } else {
@@ -88 +82 @@
         if ('' != $category_name) {
             $this->category = true;
+        }
+            
+        // single, date, and search override category.
+        if ($this->single || $this->date || $this->search) {
+            $this->category = false;                
         }