Changeset 25257

Timestamp:

09/05/2013 05:14:54 PM (11 years ago)

Author:

wonderboymusic

Message:

Avoid database error when include or exclude is not really a term_id. Adds more unit tests.

Props kovshenin.
Fixes #11823.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -1311 +1311 @@
     }
 
-    if ( ! empty( $inclusions ) )
+    if ( ! empty( $inclusions ) ) {
         $inclusions = ' AND t.term_id IN ( ' . $inclusions . ' )';
-    $where .= $inclusions;
+        $where .= $inclusions;
+    }
 
     $exclusions = '';
@@ -1340 +1341 @@
 
     $exclusions = apply_filters( 'list_terms_exclusions', $exclusions, $args );
-    $where .= $exclusions;
+
+    if ( ! empty( $exclusions ) )
+        $where .= $exclusions;
 
     if ( !empty($slug) ) {

trunk/tests/phpunit/tests/term/getTerms.php

@@ -122 +122 @@
 
     /**
-     * @ti
-     * cket 11823
+     * @ticket 11823
      */
     function test_get_terms_include_exclude() {
+        global $wpdb;
+
         $term_id1 = $this->factory->tag->create();
         $term_id2 = $this->factory->tag->create();
@@ -139 +140 @@
         ) );
         $this->assertEquals( array(), wp_list_pluck( $exc_terms, 'term_id' ) );
+
+        // These should not generate query errors.
+        get_terms( 'post_tag', array( 'exclude' => array( 0 ), 'hide_empty' => false ) );
+        $this->assertEmpty( $wpdb->last_error );
+
+        get_terms( 'post_tag', array( 'exclude' => array( 'unexpected-string' ), 'hide_empty' => false ) );
+        $this->assertEmpty( $wpdb->last_error );
+
+        get_terms( 'post_tag', array( 'include' => array( 'unexpected-string' ), 'hide_empty' => false ) );
+        $this->assertEmpty( $wpdb->last_error );
     }