Changeset 22109 for trunk/wp-includes/taxonomy.php

Timestamp:

10/04/2012 01:16:47 PM (13 years ago)

Author:

ryan

Message:

An empty taxonomy query should return no results rather than all posts. Props wonderboymusic. fixes #20604

File:

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

trunk/wp-includes/taxonomy.php

@@ -661 +661 @@
         $where = array();
         $i = 0;
-
-        foreach ( $this->queries as $query ) {
+        $count = count( $this->queries );
+
+        foreach ( $this->queries as $index => $query ) {
             $this->clean_query( $query );
 
-            if ( is_wp_error( $query ) ) {
+            if ( is_wp_error( $query ) )
                 return self::$no_results;
-            }
 
             extract( $query );
@@ -674 +674 @@
 
                 if ( empty( $terms ) ) {
-                    if ( 'OR' == $this->relation )
+                    if ( 'OR' == $this->relation ) {
+                        if ( ( $index + 1 === $count ) && empty( $where ) )
+                            return self::$no_results;
                         continue;
-                    else
+                    } else {
                         return self::$no_results;
+                    }
                 }
 
@@ -721 +724 @@
         }
 
-        if ( !empty( $where ) )
+        if ( ! empty( $where ) )
             $where = ' AND ( ' . implode( " $this->relation ", $where ) . ' )';
         else