Changeset 44468 for trunk/src/wp-includes/ms-blogs.php

Timestamp:

01/08/2019 08:47:37 AM (6 years ago)

Author:

flixos90

Message:

Multisite: Move site-specific metadata integrations from the wrapper functions to the low-level Meta API functions.

This complements the work in [43729] and prepares site metadata for future REST API support.

Props spacedmonkey.
Fixes #45091. See #44467.

File:

• trunk/src/wp-includes/ms-blogs.php (modified) (7 diffs)

trunk/src/wp-includes/ms-blogs.php

@@ -757 +757 @@
  */
 function update_sitemeta_cache( $site_ids ) {
-    if ( ! is_site_meta_supported() ) {
-        return false;
-    }
-
     return update_meta_cache( 'blog', $site_ids );
 }
@@ -1476 +1472 @@
  */
 function add_site_meta( $site_id, $meta_key, $meta_value, $unique = false ) {
-    // Bail if site meta table is not installed.
-    if ( ! is_site_meta_supported() ) {
-        /* translators: %s: database table name */
-        _doing_it_wrong( __FUNCTION__, sprintf( __( 'The %s table is not installed. Please run the network database upgrade.' ), $GLOBALS['wpdb']->blogmeta ), '5.1.0' );
-        return false;
-    }
-
-    $added = add_metadata( 'blog', $site_id, $meta_key, $meta_value, $unique );
-
-    // Bust site query cache.
-    if ( $added ) {
-        wp_cache_set( 'last_changed', microtime(), 'sites' );
-    }
-
-    return $added;
+    return add_metadata( 'blog', $site_id, $meta_key, $meta_value, $unique );
 }
 
@@ -1509 +1491 @@
  */
 function delete_site_meta( $site_id, $meta_key, $meta_value = '' ) {
-    // Bail if site meta table is not installed.
-    if ( ! is_site_meta_supported() ) {
-        /* translators: %s: database table name */
-        _doing_it_wrong( __FUNCTION__, sprintf( __( 'The %s table is not installed. Please run the network database upgrade.' ), $GLOBALS['wpdb']->blogmeta ), '5.1.0' );
-        return false;
-    }
-
-    $deleted = delete_metadata( 'blog', $site_id, $meta_key, $meta_value );
-
-    // Bust site query cache.
-    if ( $deleted ) {
-        wp_cache_set( 'last_changed', microtime(), 'sites' );
-    }
-
-    return $deleted;
+    return delete_metadata( 'blog', $site_id, $meta_key, $meta_value );
 }
 
@@ -1539 +1507 @@
  */
 function get_site_meta( $site_id, $key = '', $single = false ) {
-    // Bail if site meta table is not installed.
-    if ( ! is_site_meta_supported() ) {
-        /* translators: %s: database table name */
-        _doing_it_wrong( __FUNCTION__, sprintf( __( 'The %s table is not installed. Please run the network database upgrade.' ), $GLOBALS['wpdb']->blogmeta ), '5.1.0' );
-        return false;
-    }
-
     return get_metadata( 'blog', $site_id, $key, $single );
 }
@@ -1568 +1529 @@
  */
 function update_site_meta( $site_id, $meta_key, $meta_value, $prev_value = '' ) {
-    // Bail if site meta table is not installed.
-    if ( ! is_site_meta_supported() ) {
-        /* translators: %s: database table name */
-        _doing_it_wrong( __FUNCTION__, sprintf( __( 'The %s table is not installed. Please run the network database upgrade.' ), $GLOBALS['wpdb']->blogmeta ), '5.1.0' );
-        return false;
-    }
-
-    $updated = update_metadata( 'blog', $site_id, $meta_key, $meta_value, $prev_value );
-
-    // Bust site query cache.
-    if ( $updated ) {
-        wp_cache_set( 'last_changed', microtime(), 'sites' );
-    }
-
-    return $updated;
+    return update_metadata( 'blog', $site_id, $meta_key, $meta_value, $prev_value );
 }
 
@@ -1594 +1541 @@
  */
 function delete_site_meta_by_key( $meta_key ) {
-    // Bail if site meta table is not installed.
-    if ( ! is_site_meta_supported() ) {
-        /* translators: %s: database table name */
-        _doing_it_wrong( __FUNCTION__, sprintf( __( 'The %s table is not installed. Please run the network database upgrade.' ), $GLOBALS['wpdb']->blogmeta ), '5.1.0' );
-        return false;
-    }
-
-    $deleted = delete_metadata( 'blog', null, $meta_key, '', true );
-
-    // Bust site query cache.
-    if ( $deleted ) {
-        wp_cache_set( 'last_changed', microtime(), 'sites' );
-    }
-
-    return $deleted;
+    return delete_metadata( 'blog', null, $meta_key, '', true );
 }
 
@@ -2310 +2243 @@
     update_blog_option( $site_id, 'blog_public', $public );
 }
+
+/**
+ * Sets the last changed time for the 'sites' cache group.
+ *
+ * @since 5.1.0
+ */
+function wp_cache_set_sites_last_changed() {
+    wp_cache_set( 'last_changed', microtime(), 'sites' );
+}
+
+/**
+ * Aborts calls to site meta if it is not supported.
+ *
+ * @since 5.1.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param mixed $check Skip-value for whether to proceed site meta function execution.
+ * @return mixed Original value of $check, or false if site meta is not supported.
+ */
+function wp_check_site_meta_support_prefilter( $check ) {
+    if ( ! is_site_meta_supported() ) {
+        /* translators: %s: database table name */
+        _doing_it_wrong( __FUNCTION__, sprintf( __( 'The %s table is not installed. Please run the network database upgrade.' ), $GLOBALS['wpdb']->blogmeta ), '5.1.0' );
+        return false;
+    }
+
+    return $check;
+}