Changeset 29931

Timestamp:

10/16/2014 10:06:46 PM (12 years ago)

Author:

boonebgorges

Message:

Remove invalid continue calls from WP_Tax_Query::get_sql_for_clause().

This was leftover code from the previous implementation, which used a foreach()
loop. See [29901].

Props nofearinc.
See #29738, #29718.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (2 diffs)
• tests/phpunit/tests/term/query.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -1042 +1042 @@
 
                         if ( empty( $terms ) ) {
-                                continue;
+                                return $sql;
                         }
 
@@ -1056 +1056 @@
 
                         if ( empty( $terms ) ) {
-                                continue;
+                                return $sql;
                         }
 

trunk/tests/phpunit/tests/term/query.php

@@ -353 +353 @@
         }
 
+        /**
+         * @ticket 29738
+         */
+        public function test_get_sql_operator_not_in_empty_terms() {
+                register_taxonomy( 'wptests_tax', 'post' );
+
+                $tq = new WP_Tax_Query( array(
+                        'relation' => 'OR',
+                        array(
+                                'taxonomy' => 'wptests_tax',
+                                'field' => 'term_id',
+                                'operator' => 'NOT IN',
+                                'terms' => array(),
+                        ),
+                ) );
+
+                global $wpdb;
+                $expected = array(
+                        'join' => '',
+                        'where' => '',
+                );
+
+                $this->assertSame( $expected, $tq->get_sql( $wpdb->posts, 'ID' ) );
+
+                _unregister_taxonomy( 'wptests_tax' );
+        }
+
+        /**
+         * @ticket 29738
+         */
+        public function test_get_sql_operator_and_empty_terms() {
+                register_taxonomy( 'wptests_tax', 'post' );
+
+                $tq = new WP_Tax_Query( array(
+                        'relation' => 'OR',
+                        array(
+                                'taxonomy' => 'wptests_tax',
+                                'field' => 'term_id',
+                                'operator' => 'AND',
+                                'terms' => array(),
+                        ),
+                ) );
+
+                global $wpdb;
+                $expected = array(
+                        'join' => '',
+                        'where' => '',
+                );
+
+                $this->assertSame( $expected, $tq->get_sql( $wpdb->posts, 'ID' ) );
+
+                _unregister_taxonomy( 'wptests_tax' );
+        }
 }