Ticket #36950: 36950.patch

src/wp-includes/taxonomy.php

@@ -927 +927 @@
                 return false;
         }
 
-        $tax_clause = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
-
         if ( 'slug' == $field ) {
-                $_field = 't.slug';
                 $value = sanitize_title($value);
-                if ( empty($value) )
+                if ( empty( $value ) ) {
                         return false;
+                }
+                $terms = get_terms( array(
+                        'taxonomy'   => $taxonomy,
+                        'hide_empty' => false,
+                        'number'     => 1,
+                        'slug'       => $value
+                ) );
+                if ( empty( $terms ) || is_wp_error( $terms ) ) {
+                        return false;
+                }
+                $term = array_shift( $terms );
         } elseif ( 'name' == $field ) {
                 // Assume already escaped
                 $value = wp_unslash($value);
-                $_field = 't.name';
+                $terms = get_terms( array(
+                        'taxonomy'   => $taxonomy,
+                        'hide_empty' => false,
+                        'number'     => 1,
+                        'name'       => $value
+                ) );
+                if ( empty( $terms ) || is_wp_error( $terms ) ) {
+                        return false;
+                }
+                $term = array_shift( $terms );
         } elseif ( 'term_taxonomy_id' == $field ) {
                 $value = (int) $value;
                 $_field = 'tt.term_taxonomy_id';
 
-                // No `taxonomy` clause when searching by 'term_taxonomy_id'.
-                $tax_clause = '';
+                $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", $value ) . " LIMIT 1" );
+                if ( ! $term ) {
+                        return false;
+                }
         } else {
                 $term = get_term( (int) $value, $taxonomy, $output, $filter );
                 if ( is_wp_error( $term ) || is_null( $term ) ) {
@@ -952 +971 @@
                 return $term;
         }
 
-        $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", $value ) . " $tax_clause LIMIT 1" );
-        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;