Changeset 43729 for branches/5.0/src/wp-includes/taxonomy.php

Timestamp:

10/15/2018 11:45:16 AM (6 years ago)

Author:

flixos90

Message:

REST API: Move object type-specific metadata integrations from the wrapper functions to the low-level Meta API functions.

Object type-specific actions that should happen before or after modification of metadata have so far been part of the respective wrapper functions. By using action and filter hooks, this changeset ensures they are always executed, even when calling the lower-level Meta API functions directly, which the REST API does as a prime example.

Props flixos90, spacedmonkey.
Fixes #44467.

File:

• branches/5.0/src/wp-includes/taxonomy.php (modified) (7 diffs)

branches/5.0/src/wp-includes/taxonomy.php

@@ -1136 +1136 @@
  */
 function add_term_meta( $term_id, $meta_key, $meta_value, $unique = false ) {
-    // Bail if term meta table is not installed.
-    if ( get_option( 'db_version' ) < 34370 ) {
-        return false;
-    }
-
     if ( wp_term_is_shared( $term_id ) ) {
         return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.'), $term_id );
     }
 
-    $added = add_metadata( 'term', $term_id, $meta_key, $meta_value, $unique );
-
-    // Bust term query cache.
-    if ( $added ) {
-        wp_cache_set( 'last_changed', microtime(), 'terms' );
-    }
-
-    return $added;
+    return add_metadata( 'term', $term_id, $meta_key, $meta_value, $unique );
 }
 
@@ -1166 +1154 @@
  */
 function delete_term_meta( $term_id, $meta_key, $meta_value = '' ) {
-    // Bail if term meta table is not installed.
-    if ( get_option( 'db_version' ) < 34370 ) {
-        return false;
-    }
-
-    $deleted = delete_metadata( 'term', $term_id, $meta_key, $meta_value );
-
-    // Bust term query cache.
-    if ( $deleted ) {
-        wp_cache_set( 'last_changed', microtime(), 'terms' );
-    }
-
-    return $deleted;
+    return delete_metadata( 'term', $term_id, $meta_key, $meta_value );
 }
 
@@ -1193 +1169 @@
  */
 function get_term_meta( $term_id, $key = '', $single = false ) {
-    // Bail if term meta table is not installed.
-    if ( get_option( 'db_version' ) < 34370 ) {
-        return false;
-    }
-
     return get_metadata( 'term', $term_id, $key, $single );
 }
@@ -1218 +1189 @@
  */
 function update_term_meta( $term_id, $meta_key, $meta_value, $prev_value = '' ) {
-    // Bail if term meta table is not installed.
-    if ( get_option( 'db_version' ) < 34370 ) {
-        return false;
-    }
-
     if ( wp_term_is_shared( $term_id ) ) {
         return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.'), $term_id );
     }
 
-    $updated = update_metadata( 'term', $term_id, $meta_key, $meta_value, $prev_value );
-
-    // Bust term query cache.
-    if ( $updated ) {
-        wp_cache_set( 'last_changed', microtime(), 'terms' );
-    }
-
-    return $updated;
+    return update_metadata( 'term', $term_id, $meta_key, $meta_value, $prev_value );
 }
 
@@ -1249 +1208 @@
  */
 function update_termmeta_cache( $term_ids ) {
-    // Bail if term meta table is not installed.
-    if ( get_option( 'db_version' ) < 34370 ) {
-        return;
-    }
-
     return update_meta_cache( 'term', $term_ids );
 }
@@ -1268 +1222 @@
  */
 function has_term_meta( $term_id ) {
-    // Bail if term meta table is not installed.
-    if ( get_option( 'db_version' ) < 34370 ) {
-        return false;
+    $check = wp_check_term_meta_support_prefilter( null );
+    if ( null !== $check ) {
+        return $check;
     }
 
@@ -4342 +4296 @@
     return $parent;
 }
+
+/**
+ * Sets the last changed time for the 'terms' cache group.
+ *
+ * @since 5.0.0
+ */
+function wp_cache_set_terms_last_changed() {
+    wp_cache_set( 'last_changed', microtime(), 'terms' );
+}
+
+/**
+ * Aborts calls to term meta if it is not supported.
+ *
+ * @since 5.0.0
+ *
+ * @param mixed $check Skip-value for whether to proceed term meta function execution.
+ * @return mixed Original value of $check, or false if term meta is not supported.
+ */
+function wp_check_term_meta_support_prefilter( $check ) {
+    if ( get_option( 'db_version' ) < 34370 ) {
+        return false;
+    }
+
+    return $check;
+}