--- a/wp/wp-includes/ms-blogs.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-includes/ms-blogs.php Mon Oct 14 17:39:30 2019 +0200
@@ -5,45 +5,53 @@
*
* @package WordPress
* @subpackage Multisite
- * @since MU
+ * @since MU (3.0.0)
*/
/**
- * Update the last_updated field for the current blog.
+ * Update the last_updated field for the current site.
*
- * @since MU
+ * @since MU (3.0.0)
*/
function wpmu_update_blogs_date() {
- global $wpdb;
+ $site_id = get_current_blog_id();
- update_blog_details( $wpdb->blogid, array('last_updated' => current_time('mysql', true)) );
+ update_blog_details( $site_id, array( 'last_updated' => current_time( 'mysql', true ) ) );
/**
* Fires after the blog details are updated.
*
- * @since MU
+ * @since MU (3.0.0)
*
- * @param int $blog_id Blog ID.
+ * @param int $blog_id Site ID.
*/
- do_action( 'wpmu_blog_updated', $wpdb->blogid );
+ do_action( 'wpmu_blog_updated', $site_id );
}
/**
* Get a full blog URL, given a blog id.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param int $blog_id Blog ID
* @return string Full URL of the blog if found. Empty string if not.
*/
function get_blogaddress_by_id( $blog_id ) {
- $bloginfo = get_blog_details( (int) $blog_id, false ); // only get bare details!
- return ( $bloginfo ) ? esc_url( 'http://' . $bloginfo->domain . $bloginfo->path ) : '';
+ $bloginfo = get_site( (int) $blog_id );
+
+ if ( empty( $bloginfo ) ) {
+ return '';
+ }
+
+ $scheme = parse_url( $bloginfo->home, PHP_URL_SCHEME );
+ $scheme = empty( $scheme ) ? 'http' : $scheme;
+
+ return esc_url( $scheme . '://' . $bloginfo->domain . $bloginfo->path );
}
/**
* Get a full blog URL, given a blog name.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param string $blogname The (subdomain or directory) name
* @return string
@@ -62,44 +70,52 @@
}
/**
- * Given a blog's (subdomain or directory) slug, retrieve its id.
+ * Retrieves a sites ID given its (subdomain or directory) slug.
*
- * @since MU
+ * @since MU (3.0.0)
+ * @since 4.7.0 Converted to use get_sites().
*
- * @param string $slug
- * @return int A blog id
+ * @param string $slug A site's slug.
+ * @return int|null The site ID, or null if no site is found for the given slug.
*/
function get_id_from_blogname( $slug ) {
- global $wpdb;
-
- $current_site = get_current_site();
+ $current_network = get_network();
$slug = trim( $slug, '/' );
- $blog_id = wp_cache_get( 'get_id_from_blogname_' . $slug, 'blog-details' );
- if ( $blog_id )
- return $blog_id;
-
if ( is_subdomain_install() ) {
- $domain = $slug . '.' . $current_site->domain;
- $path = $current_site->path;
+ $domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_network->domain );
+ $path = $current_network->path;
} else {
- $domain = $current_site->domain;
- $path = $current_site->path . $slug . '/';
+ $domain = $current_network->domain;
+ $path = $current_network->path . $slug . '/';
}
- $blog_id = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM {$wpdb->blogs} WHERE domain = %s AND path = %s", $domain, $path) );
- wp_cache_set( 'get_id_from_blogname_' . $slug, $blog_id, 'blog-details' );
- return $blog_id;
+ $site_ids = get_sites( array(
+ 'number' => 1,
+ 'fields' => 'ids',
+ 'domain' => $domain,
+ 'path' => $path,
+ ) );
+
+ if ( empty( $site_ids ) ) {
+ return null;
+ }
+
+ return array_shift( $site_ids );
}
/**
* Retrieve the details for a blog from the blogs table and blog options.
*
- * @since MU
+ * @since MU (3.0.0)
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
*
- * @param int|string|array $fields A blog ID, a blog slug, or an array of fields to query against. Optional. If not specified the current blog ID is used.
- * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
- * @return object|false Blog details on success. False on failure.
+ * @param int|string|array $fields Optional. A blog ID, a blog slug, or an array of fields to query against.
+ * If not specified the current blog ID is used.
+ * @param bool $get_all Whether to retrieve all details or only the details in the blogs table.
+ * Default is true.
+ * @return WP_Site|false Blog details on success. False on failure.
*/
function get_blog_details( $fields = null, $get_all = true ) {
global $wpdb;
@@ -194,7 +210,7 @@
}
if ( empty($details) ) {
- $details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE blog_id = %d /* get_blog_details */", $blog_id ) );
+ $details = WP_Site::get_instance( $blog_id );
if ( ! $details ) {
// Set the full cache.
wp_cache_set( $blog_id, -1, 'blog-details' );
@@ -202,25 +218,31 @@
}
}
+ if ( ! $details instanceof WP_Site ) {
+ $details = new WP_Site( $details );
+ }
+
if ( ! $get_all ) {
wp_cache_set( $blog_id . $all, $details, 'blog-details' );
return $details;
}
switch_to_blog( $blog_id );
- $details->blogname = get_option( 'blogname' );
- $details->siteurl = get_option( 'siteurl' );
- $details->post_count = get_option( 'post_count' );
+ $details->blogname = get_option( 'blogname' );
+ $details->siteurl = get_option( 'siteurl' );
+ $details->post_count = get_option( 'post_count' );
+ $details->home = get_option( 'home' );
restore_current_blog();
/**
- * Filter a blog's details.
+ * Filters a blog's details.
*
- * @since MU
+ * @since MU (3.0.0)
+ * @deprecated 4.7.0 Use site_details
*
* @param object $details The blog details.
*/
- $details = apply_filters( 'blog_details', $details );
+ $details = apply_filters_deprecated( 'blog_details', array( $details ), '4.7.0', 'site_details' );
wp_cache_set( $blog_id . $all, $details, 'blog-details' );
@@ -233,7 +255,7 @@
/**
* Clear the blog details cache.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param int $blog_id Optional. Blog ID. Defaults to current blog.
*/
@@ -243,36 +265,17 @@
$blog_id = get_current_blog_id();
}
- $details = get_blog_details( $blog_id, false );
- if ( ! $details ) {
- // Make sure clean_blog_cache() gets the blog ID
- // when the blog has been previously cached as
- // non-existent.
- $details = (object) array(
- 'blog_id' => $blog_id,
- 'domain' => null,
- 'path' => null
- );
- }
-
- clean_blog_cache( $details );
-
- /**
- * Fires after the blog details cache is cleared.
- *
- * @since 3.4.0
- *
- * @param int $blog_id Blog ID.
- */
- do_action( 'refresh_blog_details', $blog_id );
+ clean_blog_cache( $blog_id );
}
/**
* Update the details for a blog. Updates the blogs table for a given blog id.
*
- * @since MU
+ * @since MU (3.0.0)
*
- * @param int $blog_id Blog ID
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param int $blog_id Blog ID
* @param array $details Array of details keyed by blogs table field names.
* @return bool True if update succeeds, false otherwise.
*/
@@ -285,7 +288,7 @@
if ( is_object($details) )
$details = get_object_vars($details);
- $current_details = get_blog_details($blog_id, false);
+ $current_details = get_site( $blog_id );
if ( empty($current_details) )
return false;
@@ -313,18 +316,18 @@
if ( $details['spam'] != $current_details['spam'] ) {
if ( $details['spam'] == 1 ) {
/**
- * Fires when the blog status is changed to 'spam'.
+ * Fires when the 'spam' status is added to a blog.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param int $blog_id Blog ID.
*/
do_action( 'make_spam_blog', $blog_id );
} else {
/**
- * Fires when the blog status is changed to 'ham'.
+ * Fires when the 'spam' status is removed from a blog.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param int $blog_id Blog ID.
*/
@@ -336,7 +339,7 @@
if ( $details['mature'] != $current_details['mature'] ) {
if ( $details['mature'] == 1 ) {
/**
- * Fires when the blog status is changed to 'mature'.
+ * Fires when the 'mature' status is added to a blog.
*
* @since 3.1.0
*
@@ -345,7 +348,7 @@
do_action( 'mature_blog', $blog_id );
} else {
/**
- * Fires when the blog status is changed to 'unmature'.
+ * Fires when the 'mature' status is removed from a blog.
*
* @since 3.1.0
*
@@ -359,18 +362,18 @@
if ( $details['archived'] != $current_details['archived'] ) {
if ( $details['archived'] == 1 ) {
/**
- * Fires when the blog status is changed to 'archived'.
+ * Fires when the 'archived' status is added to a blog.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param int $blog_id Blog ID.
*/
do_action( 'archive_blog', $blog_id );
} else {
/**
- * Fires when the blog status is changed to 'unarchived'.
+ * Fires when the 'archived' status is removed from a blog.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param int $blog_id Blog ID.
*/
@@ -382,7 +385,7 @@
if ( $details['deleted'] != $current_details['deleted'] ) {
if ( $details['deleted'] == 1 ) {
/**
- * Fires when the blog status is changed to 'deleted'.
+ * Fires when the 'deleted' status is added to a blog.
*
* @since 3.5.0
*
@@ -391,7 +394,7 @@
do_action( 'make_delete_blog', $blog_id );
} else {
/**
- * Fires when the blog status is changed to 'undeleted'.
+ * Fires when the 'deleted' status is removed from a blog.
*
* @since 3.5.0
*
@@ -407,7 +410,7 @@
restore_current_blog();
}
- refresh_blog_details($blog_id);
+ clean_blog_cache( $blog_id );
return true;
}
@@ -417,19 +420,229 @@
*
* @since 3.5.0
*
- * @param stdClass $blog The blog details as returned from get_blog_details()
+ * @global bool $_wp_suspend_cache_invalidation
+ *
+ * @param WP_Site|int $blog The site object or ID to be cleared from cache.
*/
function clean_blog_cache( $blog ) {
+ global $_wp_suspend_cache_invalidation;
+
+ if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+ return;
+ }
+
+ if ( empty( $blog ) ) {
+ return;
+ }
+
+ $blog_id = $blog;
+ $blog = get_site( $blog_id );
+ if ( ! $blog ) {
+ if ( ! is_numeric( $blog_id ) ) {
+ return;
+ }
+
+ // Make sure a WP_Site object exists even when the site has been deleted.
+ $blog = new WP_Site( (object) array(
+ 'blog_id' => $blog_id,
+ 'domain' => null,
+ 'path' => null,
+ ) );
+ }
+
$blog_id = $blog->blog_id;
$domain_path_key = md5( $blog->domain . $blog->path );
- wp_cache_delete( $blog_id , 'blog-details' );
+ wp_cache_delete( $blog_id, 'sites' );
+ wp_cache_delete( $blog_id, 'site-details' );
+ wp_cache_delete( $blog_id, 'blog-details' );
wp_cache_delete( $blog_id . 'short' , 'blog-details' );
- wp_cache_delete( $domain_path_key, 'blog-lookup' );
+ wp_cache_delete( $domain_path_key, 'blog-lookup' );
+ wp_cache_delete( $domain_path_key, 'blog-id-cache' );
wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
wp_cache_delete( 'current_blog_' . $blog->domain . $blog->path, 'site-options' );
- wp_cache_delete( 'get_id_from_blogname_' . trim( $blog->path, '/' ), 'blog-details' );
- wp_cache_delete( $domain_path_key, 'blog-id-cache' );
+
+ /**
+ * Fires immediately after a site has been removed from the object cache.
+ *
+ * @since 4.6.0
+ *
+ * @param int $id Blog ID.
+ * @param WP_Site $blog Site object.
+ * @param string $domain_path_key md5 hash of domain and path.
+ */
+ do_action( 'clean_site_cache', $blog_id, $blog, $domain_path_key );
+
+ wp_cache_set( 'last_changed', microtime(), 'sites' );
+
+ /**
+ * Fires after the blog details cache is cleared.
+ *
+ * @since 3.4.0
+ * @deprecated 4.9.0 Use clean_site_cache
+ *
+ * @param int $blog_id Blog ID.
+ */
+ do_action_deprecated( 'refresh_blog_details', array( $blog_id ), '4.9.0', 'clean_site_cache' );
+}
+
+/**
+ * Cleans the site details cache for a site.
+ *
+ * @since 4.7.4
+ *
+ * @param int $site_id Optional. Site ID. Default is the current site ID.
+ */
+function clean_site_details_cache( $site_id = 0 ) {
+ $site_id = (int) $site_id;
+ if ( ! $site_id ) {
+ $site_id = get_current_blog_id();
+ }
+
+ wp_cache_delete( $site_id, 'site-details' );
+ wp_cache_delete( $site_id, 'blog-details' );
+}
+
+/**
+ * Retrieves site data given a site ID or site object.
+ *
+ * Site data will be cached and returned after being passed through a filter.
+ * If the provided site is empty, the current site global will be used.
+ *
+ * @since 4.6.0
+ *
+ * @param WP_Site|int|null $site Optional. Site to retrieve. Default is the current site.
+ * @return WP_Site|null The site object or null if not found.
+ */
+function get_site( $site = null ) {
+ if ( empty( $site ) ) {
+ $site = get_current_blog_id();
+ }
+
+ if ( $site instanceof WP_Site ) {
+ $_site = $site;
+ } elseif ( is_object( $site ) ) {
+ $_site = new WP_Site( $site );
+ } else {
+ $_site = WP_Site::get_instance( $site );
+ }
+
+ if ( ! $_site ) {
+ return null;
+ }
+
+ /**
+ * Fires after a site is retrieved.
+ *
+ * @since 4.6.0
+ *
+ * @param WP_Site $_site Site data.
+ */
+ $_site = apply_filters( 'get_site', $_site );
+
+ return $_site;
+}
+
+/**
+ * Adds any sites from the given ids to the cache that do not already exist in cache.
+ *
+ * @since 4.6.0
+ * @access private
+ *
+ * @see update_site_cache()
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param array $ids ID list.
+ */
+function _prime_site_caches( $ids ) {
+ global $wpdb;
+
+ $non_cached_ids = _get_non_cached_ids( $ids, 'sites' );
+ if ( ! empty( $non_cached_ids ) ) {
+ $fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+
+ update_site_cache( $fresh_sites );
+ }
+}
+
+/**
+ * Updates sites in cache.
+ *
+ * @since 4.6.0
+ *
+ * @param array $sites Array of site objects.
+ */
+function update_site_cache( $sites ) {
+ if ( ! $sites ) {
+ return;
+ }
+
+ foreach ( $sites as $site ) {
+ wp_cache_add( $site->blog_id, $site, 'sites' );
+ wp_cache_add( $site->blog_id . 'short', $site, 'blog-details' );
+ }
+}
+
+/**
+ * Retrieves a list of sites matching requested arguments.
+ *
+ * @since 4.6.0
+ * @since 4.8.0 Introduced the 'lang_id', 'lang__in', and 'lang__not_in' parameters.
+ *
+ * @see WP_Site_Query::parse_query()
+ *
+ * @param string|array $args {
+ * Optional. Array or query string of site query parameters. Default empty.
+ *
+ * @type array $site__in Array of site IDs to include. Default empty.
+ * @type array $site__not_in Array of site IDs to exclude. Default empty.
+ * @type bool $count Whether to return a site count (true) or array of site objects.
+ * Default false.
+ * @type array $date_query Date query clauses to limit sites by. See WP_Date_Query.
+ * Default null.
+ * @type string $fields Site fields to return. Accepts 'ids' (returns an array of site IDs)
+ * or empty (returns an array of complete site objects). Default empty.
+ * @type int $ID A site ID to only return that site. Default empty.
+ * @type int $number Maximum number of sites to retrieve. Default 100.
+ * @type int $offset Number of sites to offset the query. Used to build LIMIT clause.
+ * Default 0.
+ * @type bool $no_found_rows Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true.
+ * @type string|array $orderby Site status or array of statuses. Accepts 'id', 'domain', 'path',
+ * 'network_id', 'last_updated', 'registered', 'domain_length',
+ * 'path_length', 'site__in' and 'network__in'. Also accepts false,
+ * an empty array, or 'none' to disable `ORDER BY` clause.
+ * Default 'id'.
+ * @type string $order How to order retrieved sites. Accepts 'ASC', 'DESC'. Default 'ASC'.
+ * @type int $network_id Limit results to those affiliated with a given network ID. If 0,
+ * include all networks. Default 0.
+ * @type array $network__in Array of network IDs to include affiliated sites for. Default empty.
+ * @type array $network__not_in Array of network IDs to exclude affiliated sites for. Default empty.
+ * @type string $domain Limit results to those affiliated with a given domain. Default empty.
+ * @type array $domain__in Array of domains to include affiliated sites for. Default empty.
+ * @type array $domain__not_in Array of domains to exclude affiliated sites for. Default empty.
+ * @type string $path Limit results to those affiliated with a given path. Default empty.
+ * @type array $path__in Array of paths to include affiliated sites for. Default empty.
+ * @type array $path__not_in Array of paths to exclude affiliated sites for. Default empty.
+ * @type int $public Limit results to public sites. Accepts '1' or '0'. Default empty.
+ * @type int $archived Limit results to archived sites. Accepts '1' or '0'. Default empty.
+ * @type int $mature Limit results to mature sites. Accepts '1' or '0'. Default empty.
+ * @type int $spam Limit results to spam sites. Accepts '1' or '0'. Default empty.
+ * @type int $deleted Limit results to deleted sites. Accepts '1' or '0'. Default empty.
+ * @type int $lang_id Limit results to a language ID. Default empty.
+ * @type array $lang__in Array of language IDs to include affiliated sites for. Default empty.
+ * @type array $lang__not_in Array of language IDs to exclude affiliated sites for. Default empty.
+ * @type string $search Search term(s) to retrieve matching sites for. Default empty.
+ * @type array $search_columns Array of column names to be searched. Accepts 'domain' and 'path'.
+ * Default empty array.
+ * @type bool $update_site_cache Whether to prime the cache for found sites. Default true.
+ * }
+ * @return array|int List of WP_Site objects, a list of site ids when 'fields' is set to 'ids',
+ * or the number of sites when 'count' is passed as a query var.
+ */
+function get_sites( $args = array() ) {
+ $query = new WP_Site_Query();
+
+ return $query->query( $args );
}
/**
@@ -442,11 +655,11 @@
*
* If the option was serialized then it will be unserialized when it is returned.
*
- * @since MU
+ * @since MU (3.0.0)
*
- * @param int $id A blog ID. Can be null to refer to the current blog.
- * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
- * @param mixed $default Optional. Default value to return if the option does not exist.
+ * @param int $id A blog ID. Can be null to refer to the current blog.
+ * @param string $option Name of option to retrieve. Expected to not be SQL-escaped.
+ * @param mixed $default Optional. Default value to return if the option does not exist.
* @return mixed Value set for the option.
*/
function get_blog_option( $id, $option, $default = false ) {
@@ -463,7 +676,7 @@
restore_current_blog();
/**
- * Filter a blog option value.
+ * Filters a blog option value.
*
* The dynamic portion of the hook name, `$option`, refers to the blog option name.
*
@@ -487,11 +700,11 @@
* aren't adding a protected WordPress option. Care should be taken to not name
* options the same as the ones which are protected.
*
- * @since MU
+ * @since MU (3.0.0)
*
- * @param int $id A blog ID. Can be null to refer to the current blog.
+ * @param int $id A blog ID. Can be null to refer to the current blog.
* @param string $option Name of option to add. Expected to not be SQL-escaped.
- * @param mixed $value Optional. Option value, can be anything. Expected to not be SQL-escaped.
+ * @param mixed $value Optional. Option value, can be anything. Expected to not be SQL-escaped.
* @return bool False if option was not added and true if option was added.
*/
function add_blog_option( $id, $option, $value ) {
@@ -513,9 +726,9 @@
/**
* Removes option by name for a given blog id. Prevents removal of protected WordPress options.
*
- * @since MU
+ * @since MU (3.0.0)
*
- * @param int $id A blog ID. Can be null to refer to the current blog.
+ * @param int $id A blog ID. Can be null to refer to the current blog.
* @param string $option Name of option to remove. Expected to not be SQL-escaped.
* @return bool True, if option is successfully deleted. False on failure.
*/
@@ -538,18 +751,19 @@
/**
* Update an option for a particular blog.
*
- * @since MU
+ * @since MU (3.0.0)
*
- * @param int $id The blog id
- * @param string $option The option key
- * @param mixed $value The option value
+ * @param int $id The blog id.
+ * @param string $option The option key.
+ * @param mixed $value The option value.
+ * @param mixed $deprecated Not used.
* @return bool True on success, false on failure.
*/
function update_blog_option( $id, $option, $value, $deprecated = null ) {
$id = (int) $id;
if ( null !== $deprecated )
- _deprecated_argument( __FUNCTION__, '3.1' );
+ _deprecated_argument( __FUNCTION__, '3.1.0' );
if ( get_current_blog_id() == $id )
return update_option( $option, $value );
@@ -558,8 +772,6 @@
$return = update_option( $option, $value );
restore_current_blog();
- refresh_blog_details( $id );
-
return $return;
}
@@ -570,34 +782,42 @@
* from other blogs. You can switch back afterwards using restore_current_blog().
*
* Things that aren't switched:
- * - autoloaded options. See #14992
* - plugins. See #14941
*
* @see restore_current_blog()
- * @since MU
+ * @since MU (3.0.0)
*
- * @param int $new_blog The id of the blog you want to switch to. Default: current blog
+ * @global wpdb $wpdb
+ * @global int $blog_id
+ * @global array $_wp_switched_stack
+ * @global bool $switched
+ * @global string $table_prefix
+ * @global WP_Object_Cache $wp_object_cache
+ *
+ * @param int $new_blog The id of the blog you want to switch to. Default: current blog
* @param bool $deprecated Deprecated argument
- * @return bool Always returns True.
+ * @return true Always returns True.
*/
function switch_to_blog( $new_blog, $deprecated = null ) {
- global $wpdb, $wp_roles;
+ global $wpdb;
- if ( empty( $new_blog ) )
- $new_blog = $GLOBALS['blog_id'];
+ $blog_id = get_current_blog_id();
+ if ( empty( $new_blog ) ) {
+ $new_blog = $blog_id;
+ }
- $GLOBALS['_wp_switched_stack'][] = $GLOBALS['blog_id'];
+ $GLOBALS['_wp_switched_stack'][] = $blog_id;
/*
* If we're switching to the same blog id that we're on,
* set the right vars, do the associated actions, but skip
* the extra unnecessary work
*/
- if ( $new_blog == $GLOBALS['blog_id'] ) {
+ if ( $new_blog == $blog_id ) {
/**
* Fires when the blog is switched.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param int $new_blog New blog ID.
* @param int $new_blog Blog ID.
@@ -609,7 +829,7 @@
$wpdb->set_blog_id( $new_blog );
$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
- $prev_blog_id = $GLOBALS['blog_id'];
+ $prev_blog_id = $blog_id;
$GLOBALS['blog_id'] = $new_blog;
if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
@@ -617,29 +837,23 @@
} else {
global $wp_object_cache;
- if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+ if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
$global_groups = $wp_object_cache->global_groups;
- else
+ } else {
$global_groups = false;
-
+ }
wp_cache_init();
if ( function_exists( 'wp_cache_add_global_groups' ) ) {
if ( is_array( $global_groups ) ) {
wp_cache_add_global_groups( $global_groups );
} else {
- wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
+ wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details' ) );
}
- wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+ wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
}
}
- if ( did_action( 'init' ) ) {
- $wp_roles->reinit();
- $current_user = wp_get_current_user();
- $current_user->for_blog( $new_blog );
- }
-
/** This filter is documented in wp-includes/ms-blogs.php */
do_action( 'switch_blog', $new_blog, $prev_blog_id );
$GLOBALS['switched'] = true;
@@ -651,19 +865,28 @@
* Restore the current blog, after calling switch_to_blog()
*
* @see switch_to_blog()
- * @since MU
+ * @since MU (3.0.0)
+ *
+ * @global wpdb $wpdb
+ * @global array $_wp_switched_stack
+ * @global int $blog_id
+ * @global bool $switched
+ * @global string $table_prefix
+ * @global WP_Object_Cache $wp_object_cache
*
* @return bool True on success, false if we're already on the current blog
*/
function restore_current_blog() {
- global $wpdb, $wp_roles;
+ global $wpdb;
- if ( empty( $GLOBALS['_wp_switched_stack'] ) )
+ if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
return false;
+ }
$blog = array_pop( $GLOBALS['_wp_switched_stack'] );
+ $blog_id = get_current_blog_id();
- if ( $GLOBALS['blog_id'] == $blog ) {
+ if ( $blog_id == $blog ) {
/** This filter is documented in wp-includes/ms-blogs.php */
do_action( 'switch_blog', $blog, $blog );
// If we still have items in the switched stack, consider ourselves still 'switched'
@@ -672,7 +895,7 @@
}
$wpdb->set_blog_id( $blog );
- $prev_blog_id = $GLOBALS['blog_id'];
+ $prev_blog_id = $blog_id;
$GLOBALS['blog_id'] = $blog;
$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
@@ -681,10 +904,11 @@
} else {
global $wp_object_cache;
- if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+ if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
$global_groups = $wp_object_cache->global_groups;
- else
+ } else {
$global_groups = false;
+ }
wp_cache_init();
@@ -692,18 +916,12 @@
if ( is_array( $global_groups ) ) {
wp_cache_add_global_groups( $global_groups );
} else {
- wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
+ wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details' ) );
}
- wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
+ wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
}
}
- if ( did_action( 'init' ) ) {
- $wp_roles->reinit();
- $current_user = wp_get_current_user();
- $current_user->for_blog( $blog );
- }
-
/** This filter is documented in wp-includes/ms-blogs.php */
do_action( 'switch_blog', $blog, $prev_blog_id );
@@ -714,10 +932,33 @@
}
/**
+ * Switches the initialized roles and current user capabilities to another site.
+ *
+ * @since 4.9.0
+ *
+ * @param int $new_site_id New site ID.
+ * @param int $old_site_id Old site ID.
+ */
+function wp_switch_roles_and_user( $new_site_id, $old_site_id ) {
+ if ( $new_site_id == $old_site_id ) {
+ return;
+ }
+
+ if ( ! did_action( 'init' ) ) {
+ return;
+ }
+
+ wp_roles()->for_site( $new_site_id );
+ wp_get_current_user()->for_site( $new_site_id );
+}
+
+/**
* Determines if switch_to_blog() is in effect
*
* @since 3.5.0
*
+ * @global array $_wp_switched_stack
+ *
* @return bool True if switched, false otherwise.
*/
function ms_is_switched() {
@@ -727,7 +968,7 @@
/**
* Check if a particular blog is archived.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param int $id The blog id
* @return string Whether the blog is archived or not
@@ -739,9 +980,9 @@
/**
* Update the 'archived' status of a particular blog.
*
- * @since MU
+ * @since MU (3.0.0)
*
- * @param int $id The blog id
+ * @param int $id The blog id
* @param string $archived The new status
* @return string $archived
*/
@@ -753,18 +994,21 @@
/**
* Update a blog details field.
*
- * @since MU
+ * @since MU (3.0.0)
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
*
- * @param int $blog_id BLog ID
- * @param string $pref A field name
- * @param string $value Value for $pref
- * @return string $value
+ * @param int $blog_id BLog ID
+ * @param string $pref A field name
+ * @param string $value Value for $pref
+ * @param null $deprecated
+ * @return string|false $value
*/
function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
global $wpdb;
if ( null !== $deprecated )
- _deprecated_argument( __FUNCTION__, '3.1' );
+ _deprecated_argument( __FUNCTION__, '3.1.0' );
if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
return $value;
@@ -774,7 +1018,7 @@
if ( false === $result )
return false;
- refresh_blog_details( $blog_id );
+ clean_blog_cache( $blog_id );
if ( 'spam' == $pref ) {
if ( $value == 1 ) {
@@ -812,7 +1056,7 @@
/**
* Fires after the current blog's 'public' setting is updated.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param int $blog_id Blog ID.
* @param string $value The value of blog status.
@@ -826,16 +1070,18 @@
/**
* Get a blog details field.
*
- * @since MU
+ * @since MU (3.0.0)
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
*
- * @param int $id The blog id
+ * @param int $id The blog id
* @param string $pref A field name
- * @return bool $value
+ * @return bool|string|null $value
*/
function get_blog_status( $id, $pref ) {
global $wpdb;
- $details = get_blog_details( $id, false );
+ $details = get_site( $id );
if ( $details )
return $details->$pref;
@@ -845,11 +1091,13 @@
/**
* Get a list of most recently updated blogs.
*
- * @since MU
+ * @since MU (3.0.0)
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
*
* @param mixed $deprecated Not used
- * @param int $start The offset
- * @param int $quantity The maximum number of blogs to retrieve. Default is 40.
+ * @param int $start The offset
+ * @param int $quantity The maximum number of blogs to retrieve. Default is 40.
* @return array The list of blogs
*/
function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
@@ -858,17 +1106,148 @@
if ( ! empty( $deprecated ) )
_deprecated_argument( __FUNCTION__, 'MU' ); // never used
- return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
+ return $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", get_current_network_id(), $start, $quantity ), ARRAY_A );
+}
+
+/**
+ * Retrieves a list of networks.
+ *
+ * @since 4.6.0
+ *
+ * @param string|array $args Optional. Array or string of arguments. See WP_Network_Query::parse_query()
+ * for information on accepted arguments. Default empty array.
+ * @return array|int List of WP_Network objects, a list of network ids when 'fields' is set to 'ids',
+ * or the number of networks when 'count' is passed as a query var.
+ */
+function get_networks( $args = array() ) {
+ $query = new WP_Network_Query();
+
+ return $query->query( $args );
+}
+
+/**
+ * Retrieves network data given a network ID or network object.
+ *
+ * Network data will be cached and returned after being passed through a filter.
+ * If the provided network is empty, the current network global will be used.
+ *
+ * @since 4.6.0
+ *
+ * @global WP_Network $current_site
+ *
+ * @param WP_Network|int|null $network Optional. Network to retrieve. Default is the current network.
+ * @return WP_Network|null The network object or null if not found.
+ */
+function get_network( $network = null ) {
+ global $current_site;
+ if ( empty( $network ) && isset( $current_site ) ) {
+ $network = $current_site;
+ }
+
+ if ( $network instanceof WP_Network ) {
+ $_network = $network;
+ } elseif ( is_object( $network ) ) {
+ $_network = new WP_Network( $network );
+ } else {
+ $_network = WP_Network::get_instance( $network );
+ }
+
+ if ( ! $_network ) {
+ return null;
+ }
+
+ /**
+ * Fires after a network is retrieved.
+ *
+ * @since 4.6.0
+ *
+ * @param WP_Network $_network Network data.
+ */
+ $_network = apply_filters( 'get_network', $_network );
+
+ return $_network;
}
/**
- * Handler for updating the blog date when a post is published or an already published post is changed.
+ * Removes a network from the object cache.
+ *
+ * @since 4.6.0
+ *
+ * @global bool $_wp_suspend_cache_invalidation
+ *
+ * @param int|array $ids Network ID or an array of network IDs to remove from cache.
+ */
+function clean_network_cache( $ids ) {
+ global $_wp_suspend_cache_invalidation;
+
+ if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+ return;
+ }
+
+ foreach ( (array) $ids as $id ) {
+ wp_cache_delete( $id, 'networks' );
+
+ /**
+ * Fires immediately after a network has been removed from the object cache.
+ *
+ * @since 4.6.0
+ *
+ * @param int $id Network ID.
+ */
+ do_action( 'clean_network_cache', $id );
+ }
+
+ wp_cache_set( 'last_changed', microtime(), 'networks' );
+}
+
+/**
+ * Updates the network cache of given networks.
+ *
+ * Will add the networks in $networks to the cache. If network ID already exists
+ * in the network cache then it will not be updated. The network is added to the
+ * cache using the network group with the key using the ID of the networks.
+ *
+ * @since 4.6.0
+ *
+ * @param array $networks Array of network row objects.
+ */
+function update_network_cache( $networks ) {
+ foreach ( (array) $networks as $network ) {
+ wp_cache_add( $network->id, $network, 'networks' );
+ }
+}
+
+/**
+ * Adds any networks from the given IDs to the cache that do not already exist in cache.
+ *
+ * @since 4.6.0
+ * @access private
+ *
+ * @see update_network_cache()
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param array $network_ids Array of network IDs.
+ */
+function _prime_network_caches( $network_ids ) {
+ global $wpdb;
+
+ $non_cached_ids = _get_non_cached_ids( $network_ids, 'networks' );
+ if ( !empty( $non_cached_ids ) ) {
+ $fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+
+ update_network_cache( $fresh_networks );
+ }
+}
+
+/**
+ * Handler for updating the site's last updated date when a post is published or
+ * an already published post is changed.
*
* @since 3.3.0
*
* @param string $new_status The new post status
* @param string $old_status The old post status
- * @param object $post Post object
+ * @param object $post Post object
*/
function _update_blog_date_on_post_publish( $new_status, $old_status, $post ) {
$post_type_obj = get_post_type_object( $post->post_type );
@@ -886,7 +1265,8 @@
}
/**
- * Handler for updating the blog date when a published post is deleted.
+ * Handler for updating the current site's last updated date when a published
+ * post is deleted.
*
* @since 3.4.0
*
@@ -908,7 +1288,7 @@
}
/**
- * Handler for updating the blog posts count date when a post is deleted.
+ * Handler for updating the current site's posts count when a post is deleted.
*
* @since 4.0.0
*
@@ -917,7 +1297,7 @@
function _update_posts_count_on_delete( $post_id ) {
$post = get_post( $post_id );
- if ( ! $post || 'publish' !== $post->post_status ) {
+ if ( ! $post || 'publish' !== $post->post_status || 'post' !== $post->post_type ) {
return;
}
@@ -925,22 +1305,27 @@
}
/**
- * Handler for updating the blog posts count date when a post status changes.
+ * Handler for updating the current site's posts count when a post status changes.
*
* @since 4.0.0
+ * @since 4.9.0 Added the `$post` parameter.
*
- * @param string $new_status The status the post is changing to.
- * @param string $old_status The status the post is changing from.
+ * @param string $new_status The status the post is changing to.
+ * @param string $old_status The status the post is changing from.
+ * @param WP_Post $post Post object
*/
-function _update_posts_count_on_transition_post_status( $new_status, $old_status ) {
+function _update_posts_count_on_transition_post_status( $new_status, $old_status, $post = null ) {
if ( $new_status === $old_status ) {
return;
}
+ if ( 'post' !== get_post_type( $post ) ) {
+ return;
+ }
+
if ( 'publish' !== $new_status && 'publish' !== $old_status ) {
return;
}
update_posts_count();
}
-