Changeset 18591

Timestamp:

08/24/11 10:39:52 (3 years ago)

Author:

westi

Message:

Optimise get_term to not query for term_id = 0. Also improve the prepared query to use %d for the term_id.
Fixes #18076 props mdawaffe.

File:

• trunk/wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-includes/taxonomy.php

@@ -851 +851 @@
         if ( is_object($term) )
             $term = $term->term_id;
-        $term = (int) $term;
+        if ( !$term = (int) $term )
+            return $null;
         if ( ! $_term = wp_cache_get($term, $taxonomy) ) {
-            $_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 t.term_id = %s LIMIT 1", $taxonomy, $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 tt.taxonomy = %s AND t.term_id = %d LIMIT 1", $taxonomy, $term) );
             if ( ! $_term )
                 return $null;