Changeset 16511

Timestamp:

11/20/2010 09:10:20 PM (14 years ago)

Author:

ryan

Message:

If the queried term does not exist make sure no posts are returned in the query rather than falling through to querying all posts. Fixes 404s when querying cats that do not exist. see #12891

Location:

trunk/wp-includes

Files:

• query.php (modified) (1 diff)
• taxonomy.php (modified) (2 diffs)

trunk/wp-includes/query.php

@@ -1948 +1948 @@
             $clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
 
-            $join .= $clauses['join'];
-            $where .= $clauses['where'];
+            if ( empty($clauses['join']) && empty($clauses['where']) ) {
+                $where .= ' AND 0 = 1'; 
+            } else {
+                $join .= $clauses['join'];
+                $where .= $clauses['where'];
+            }
 
             if ( $this->is_tax ) {

trunk/wp-includes/taxonomy.php

@@ -540 +540 @@
         foreach ( $taxonomies as $taxonomy ) {
             if ( ! taxonomy_exists( $taxonomy ) )
-                return ' AND 0 = 1';
+                return array( 'join' => '', 'where' => ' AND 0 = 1');
         }
 
@@ -593 +593 @@
         }
     }
+
     return compact( 'join', 'where' );
 }