Ticket #21760: 21760.patch

taxonomy.php

@@ -873 +873 @@
  * @return mixed|null|WP_Error Term Row from database. Will return null if $term is empty. If taxonomy does not
  * exist then WP_Error will be returned.
  */
-function get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
+function get_term( $term, $taxonomy, $output = OBJECT, $filter = 'raw' ) {
         global $wpdb;
-        $null = null;
 
         if ( empty($term) ) {
-                $error = new WP_Error('invalid_term', __('Empty Term'));
-                return $error;
+                return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
         }
 
-        if ( ! taxonomy_exists($taxonomy) ) {
-                $error = new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
-                return $error;
+        if ( ! taxonomy_exists( $taxonomy ) ) {
+                return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
         }
 
-        if ( is_object($term) && empty($term->filter) ) {
-                wp_cache_add($term->term_id, $term, $taxonomy);
+        if ( is_object( $term ) && empty( $term->filter ) ) {
+                wp_cache_add( $term->term_id, $term, $taxonomy );
                 $_term = $term;
         } else {
-                if ( is_object($term) )
+                if ( is_object( $term ) ) {
                         $term = $term->term_id;
-                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 = %d LIMIT 1", $taxonomy, $term) );
-                        if ( ! $_term )
-                                return $null;
-                        wp_cache_add($term, $_term, $taxonomy);
                 }
+
+                if ( empty( $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 = %d LIMIT 1", $taxonomy, (int) $term ) );
+                        if ( empty( $_term ) ) {
+                                return null;
+                        }
+                        wp_cache_add( $term, $_term, $taxonomy );
+                }
         }
 
-        $_term = apply_filters('get_term', $_term, $taxonomy);
-        $_term = apply_filters("get_$taxonomy", $_term, $taxonomy);
-        $_term = sanitize_term($_term, $taxonomy, $filter);
+        $_term = apply_filters( 'get_term',      $_term,    $taxonomy );
+        $_term = apply_filters( "get_$taxonomy", $_term,    $taxonomy );
+        $_term = sanitize_term( $_term,          $taxonomy, $filter   );
 
-        if ( $output == OBJECT ) {
+        if ( $output === OBJECT ) {
                 return $_term;
-        } elseif ( $output == ARRAY_A ) {
-                $__term = get_object_vars($_term);
+        } elseif ( $output === ARRAY_A ) {
+                $__term = get_object_vars( $_term );
                 return $__term;
-        } elseif ( $output == ARRAY_N ) {
-                $__term = array_values(get_object_vars($_term));
+        } elseif ( $output === ARRAY_N ) {
+                $__term = array_values( get_object_vars( $_term ) );
                 return $__term;
         } else {
                 return $_term;
@@ -937 +939 @@
  * @since 2.3.0
  *
  * @uses $wpdb
+ * @uses _get_term_by() To query the database directly if no cached data exists
+ * @uses get_term() To get the term if it's already cached
+ *
+ * @param string $field Either 'slug', 'name', or 'id'
+ * @param string|int $value Search for this term value
+ * @param string $taxonomy Taxonomy Name
+ * @param string $output Constant OBJECT, ARRAY_A, or ARRAY_N
+ * @param string $filter Optional, default is raw or no WordPress defined filter will applied.
+ * @return mixed Term Row from database. Will return false if $taxonomy does not exist or $term was not found.
+ */
+function get_term_by( $field, $value, $taxonomy, $output = OBJECT, $filter = 'raw' ) {
+
+        // Allow plugins to short-circuit get_term_by()
+        $pre = apply_filters( 'pre_get_term_by_' . $field . '_' . $value . '_' . $taxonomy, false );
+        if ( false !== $pre )
+                return $pre;
+
+        // ID lookups are already cached
+        if ( 'id' == $field ) {
+                return _get_term_by( $field, $value, $taxonomy, $output, $filter );
+        }
+
+        // Build the key and check the cache
+        $cache_key = $field . '|' . $taxonomy . '|' . md5( $value );
+        $term_id   = wp_cache_get( $cache_key, 'get_term_by' );
+
+        // Not cached so hit the DB
+        if ( false === $term_id ) {
+                $term    = _get_term_by( $field, $value, $taxonomy );
+                $term_id = !empty( $term ) && ! is_wp_error( $term ) ? $term->term_id : 0;
+
+                wp_cache_set( $cache_key, $term_id, 'get_term_by' );
+
+        // Cached, so call get_term() to get the term
+        } else {
+                $term = get_term( $term_id, $taxonomy, $output, $filter );
+        }
+
+        // Set the return value to false if an error occurred
+        if ( is_wp_error( $term ) ) {
+                $term = false;
+        }
+
+        return $term;
+}
+
+/**
+ * Used internally by get_term_by(), this function is responsible for querying
+ * the database directly and priming the cache if it's needed.
+ *
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 3.7.0
+ * @internal Used by get_term_by()
+ *
+ * @uses $wpdb
  * @uses sanitize_term() Cleanses the term based on $filter context before returning.
  * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
  *
@@ -947 +1005 @@
  * @param string $filter Optional, default is raw or no WordPress defined filter will applied.
  * @return mixed Term Row from database. 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) )
+        // Taxonomy is currently a required part of the query below, so bail if it's
+        // missing, not registered, etc...
+        if ( ! taxonomy_exists( $taxonomy ) )
                 return false;
 
+        // Querying by slug
         if ( 'slug' == $field ) {
                 $field = 't.slug';
-                $value = sanitize_title($value);
-                if ( empty($value) )
+                $value = sanitize_title( $value );
+
+                // Bail if no value to check
+                if ( empty( $value ) ) {
                         return false;
+                }
         } else if ( 'name' == $field ) {
-                // Assume already escaped
-                $value = wp_unslash($value);
+                $value = wp_unslash( $value ); // Assume already escaped
                 $field = 't.name';
         } else {
-                $term = get_term( (int) $value, $taxonomy, $output, $filter);
-                if ( is_wp_error( $term ) )
+                $term = get_term( (int) $value, $taxonomy, $output, $filter );
+                if ( is_wp_error( $term ) ) {
                         $term = false;
+                }
                 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 tt.taxonomy = %s AND $field = %s LIMIT 1", $taxonomy, $value) );
-        if ( !$term )
+        // Query for the 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 {$field} = %s LIMIT 1", $taxonomy, $value ) );
+        if ( empty( $term ) ) {
                 return false;
+        }
 
-        wp_cache_add($term->term_id, $term, $taxonomy);
+        // Prime the term cache in case it's used elsewhere (like a loop of posts)
+        wp_cache_add( $term->term_id, $term, $taxonomy );
 
-        $term = apply_filters('get_term', $term, $taxonomy);
-        $term = apply_filters("get_$taxonomy", $term, $taxonomy);
-        $term = sanitize_term($term, $taxonomy, $filter);
+        // Filter and sanitize the term
+        $term = apply_filters( 'get_term',       $term,     $taxonomy );
+        $term = apply_filters( "get_$taxonomy",  $term,     $taxonomy );
+        $term = sanitize_term( $term,            $taxonomy, $filter   );
 
+        // Adjust the return value based on the $output type
         if ( $output == OBJECT ) {
                 return $term;
         } elseif ( $output == ARRAY_A ) {
-                return get_object_vars($term);
+                return get_object_vars( $term );
         } elseif ( $output == ARRAY_N ) {
-                return array_values(get_object_vars($term));
+                return array_values( get_object_vars( $term ) );
         } else {
                 return $term;
         }