Ticket #21606: 21606.diff

wp-includes/taxonomy.php

@@ -331 +331 @@
                                         );
         $args = wp_parse_args($args, $defaults);
 
-        if ( strlen( $taxonomy ) > 32 ) 
+        if ( strlen( $taxonomy ) > 32 )
                 return new WP_Error( 'taxonomy_too_long', __( 'Taxonomies cannot exceed 32 characters in length' ) );
 
         if ( false !== $args['query_var'] && !empty($wp) ) {
@@ -1490 +1490 @@
                 if ( 0 == $term )
                         return 0;
                 $where = 't.term_id = %d';
-                if ( !empty($taxonomy) )
-                        return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
-                else
-                        return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+                if ( !empty($taxonomy) ) {
+                        if ( $result = $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A ) )
+                                return $result;
+                        return 0;
+                } else {
+                        return (int) $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+                }
         }
 
         $term = trim( stripslashes( $term ) );
@@ -1520 +1523 @@
                 if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A) )
                         return $result;
 
-                return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s", $else_where_fields), ARRAY_A);
+                if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s", $else_where_fields), ARRAY_A) )
+                        return $result;
+
+                return 0;
         }
 
         if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields) ) )
                 return $result;
 
-        return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where", $else_where_fields) );
+        return (int) $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where", $else_where_fields) );
 }
 
 /**