Changeset 21836

Timestamp:

09/13/2012 05:15:13 PM (12 years ago)

Author:

nacin

Message:

Check that the taxonomy matches when calling is_tax() with only a taxonomy argument. props wonderboymusic, see #20590.

File:

• trunk/wp-includes/query.php (modified) (2 diffs)

trunk/wp-includes/query.php

@@ -2045 +2045 @@
         if ( '' !== $q['menu_order'] )
             $where .= " AND $wpdb->posts.menu_order = " . $q['menu_order'];
-        
+
         // If a month is specified in the querystring, load that month
         if ( $q['m'] ) {
@@ -3193 +3193 @@
         $term_array = (array) $term;
 
-        if ( empty( $term ) ) // Only a Taxonomy provided
-            return isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array );
+        // Check that the taxonomy matches.
+        if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) )
+            return false;
+
+        // Only a Taxonomy provided.
+        if ( empty( $term ) )
+            return true;
 
         return isset( $queried_object->term_id ) &&