Changeset 34679

Timestamp:

09/29/2015 03:51:11 AM (11 years ago)

Author:

boonebgorges

Message:

Don't require explicit taxonomy when getting terms by term_taxonomy_id.

Props wonderboymusic.
Fixes #30620.

Location:

trunk

Files:

• src/wp-includes/taxonomy-functions.php (modified) (5 diffs)
• tests/phpunit/tests/term/getTermBy.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy-functions.php

@@ -782 +782 @@
  *
  * @since 2.3.0
+ * @since 4.4.0 `$taxonomy` is optional if `$field` is 'term_taxonomy_id'.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -788 +789 @@
  * @param string     $field    Either 'slug', 'name', 'id' (term_id), or 'term_taxonomy_id'
  * @param string|int $value    Search for this term value
- * @param string     $taxonomy Taxonomy Name
+ * @param string     $taxonomy Taxonomy name. Optional, if `$field` is 'term_taxonomy_id'.
  * @param string     $output   Constant OBJECT, ARRAY_A, or ARRAY_N
  * @param string     $filter   Optional, default is raw or no WordPress defined filter will applied.
@@ -794 +795 @@
  *                                          Will return false if $taxonomy does not exist or $term was not found.
  */
-function get_term_by($field, $value, $taxonomy, $output = OBJECT, $filter = 'raw') {
+function get_term_by( $field, $value, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
         global $wpdb;
 
-        if ( ! taxonomy_exists($taxonomy) )
+        // 'term_taxonomy_id' lookups don't require taxonomy checks.
+        if ( 'term_taxonomy_id' !== $field && ! taxonomy_exists( $taxonomy ) ) {
                 return false;
+        }
+
+        $tax_clause = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
 
         if ( 'slug' == $field ) {
@@ -812 +817 @@
                 $value = (int) $value;
                 $field = 'tt.term_taxonomy_id';
+
+                // No `taxonomy` clause when searching by 'term_taxonomy_id'.
+                $tax_clause = '';
         } else {
                 $term = get_term( (int) $value, $taxonomy, $output, $filter );
@@ -820 +828 @@
         }
 
-        $term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy = %s AND $field = %s LIMIT 1", $taxonomy, $value ) );
+        $term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE $field = %s $tax_clause LIMIT 1", $value ) );
         if ( ! $term )
                 return false;
+
+        // In the case of 'term_taxonomy_id', override the provided `$taxonomy` with whatever we find in the db.
+        if ( 'term_taxonomy_id' === $field ) {
+                $taxonomy = $term->taxonomy;
+        }
 
         wp_cache_add( $term->term_id, $term, $taxonomy );

trunk/tests/phpunit/tests/term/getTermBy.php

@@ -37 +37 @@
                 $this->assertSame( $t, $found->term_id );
         }
+
+        /**
+         * @ticket 30620
+         */
+        public function test_taxonomy_should_be_ignored_if_matching_by_term_taxonomy_id() {
+                global $wpdb;
+
+                register_taxonomy( 'wptests_tax', 'post' );
+                $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $term = get_term( $t, 'wptests_tax' );
+
+                $new_ttid = $term->term_taxonomy_id + 1;
+
+                // Offset just to be sure.
+                $wpdb->update(
+                        $wpdb->term_taxonomy,
+                        array( 'term_taxonomy_id' => $new_ttid ),
+                        array( 'term_id' => $t )
+                );
+
+                $found = get_term_by( 'term_taxonomy_id', $new_ttid, 'foo' );
+                $this->assertSame( $t, $found->term_id );
+        }
 }