WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Multisite: Update `@since` tags for site meta introduction. 

Fixes #37923. Fixes #40229.

Built from https://develop.svn.wordpress.org/trunk@44467


git-svn-id: http://core.svn.wordpress.org/trunk@44298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Felix Arntz 2019-01-08 08:18:50 +00:00
parent 952c7253d3
commit 035877708d
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/upgrade.php
View File

@ -2262,7 +2262,7 @@ function upgrade_network() {
} }
// 5.1 // 5.1
if ( $wp_current_db_version < 42836 ) { if ( $wp_current_db_version < 44467 ) {
$network_id = get_main_network_id(); $network_id = get_main_network_id();
delete_network_option( $network_id, 'site_meta_supported' ); delete_network_option( $network_id, 'site_meta_supported' );
is_site_meta_supported(); is_site_meta_supported();

6
wp-includes/class-wp-site-query.php
View File

@ -42,7 +42,7 @@ class WP_Site_Query {
/** /**
* Metadata query container. * Metadata query container.
* *
* @since 5.0.0 * @since 5.1.0
* @var WP_Meta_Query * @var WP_Meta_Query
*/ */
public $meta_query = false; public $meta_query = false;
@ -50,7 +50,7 @@ class WP_Site_Query {
/** /**
* Metadata query clauses. * Metadata query clauses.
* *
* @since 5.0.0 * @since 5.1.0
* @var array * @var array
*/ */
protected $meta_query_clauses; protected $meta_query_clauses;
@ -108,7 +108,7 @@ class WP_Site_Query {
* *
* @since 4.6.0 * @since 4.6.0
* @since 4.8.0 Introduced the 'lang_id', 'lang__in', and 'lang__not_in' parameters. * @since 4.8.0 Introduced the 'lang_id', 'lang__in', and 'lang__not_in' parameters.
* @since 5.0.0 Introduced the 'update_site_meta_cache', 'meta_query', 'meta_key', * @since 5.1.0 Introduced the 'update_site_meta_cache', 'meta_query', 'meta_key',
* 'meta_value', 'meta_type' and 'meta_compare' parameters. * 'meta_value', 'meta_type' and 'meta_compare' parameters.
* *
* @param string|array $query { * @param string|array $query {

2
wp-includes/functions.php
View File

@ -4912,7 +4912,7 @@ function global_terms_enabled() {
* a setting for the main network, making it essentially a global setting. Subsequent requests * a setting for the main network, making it essentially a global setting. Subsequent requests
* will refer to this setting instead of running the query. * will refer to this setting instead of running the query.
* *
* @since 5.0.0 * @since 5.1.0
* *
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* *

26
wp-includes/ms-blogs.php
View File

@ -699,7 +699,7 @@ function get_site( $site = null ) {
* Adds any sites from the given ids to the cache that do not already exist in cache. * Adds any sites from the given ids to the cache that do not already exist in cache.
* *
* @since 4.6.0 * @since 4.6.0
* @since 5.0.0 Introduced the `$update_meta_cache` parameter. * @since 5.1.0 Introduced the `$update_meta_cache` parameter.
* @access private * @access private
* *
* @see update_site_cache() * @see update_site_cache()
@ -723,7 +723,7 @@ function _prime_site_caches( $ids, $update_meta_cache = true ) {
* Updates sites in cache. * Updates sites in cache.
* *
* @since 4.6.0 * @since 4.6.0
* @since 5.0.0 Introduced the `$update_meta_cache` parameter. * @since 5.1.0 Introduced the `$update_meta_cache` parameter.
* *
* @param array $sites Array of site objects. * @param array $sites Array of site objects.
* @param bool $update_meta_cache Whether to update site meta cache. Default true. * @param bool $update_meta_cache Whether to update site meta cache. Default true.
@ -750,7 +750,7 @@ function update_site_cache( $sites, $update_meta_cache = true ) {
* Performs SQL query to retrieve all metadata for the sites matching `$site_ids` and stores them in the cache. * Performs SQL query to retrieve all metadata for the sites matching `$site_ids` and stores them in the cache.
* Subsequent calls to `get_site_meta()` will not need to query the database. * Subsequent calls to `get_site_meta()` will not need to query the database.
* *
* @since 5.0.0 * @since 5.1.0
* *
* @param array $site_ids List of site IDs. * @param array $site_ids List of site IDs.
* @return array|false Returns false if there is nothing to update. Returns an array of metadata on success. * @return array|false Returns false if there is nothing to update. Returns an array of metadata on success.
@ -1465,7 +1465,7 @@ function update_blog_option( $id, $option, $value, $deprecated = null ) {
/** /**
* Adds metadata to a site. * Adds metadata to a site.
* *
* @since 5.0.0 * @since 5.1.0
* *
* @param int $site_id Site ID. * @param int $site_id Site ID.
* @param string $meta_key Metadata name. * @param string $meta_key Metadata name.
@ -1478,7 +1478,7 @@ function add_site_meta( $site_id, $meta_key, $meta_value, $unique = false ) {
// Bail if site meta table is not installed. // Bail if site meta table is not installed.
if ( ! is_site_meta_supported() ) { if ( ! is_site_meta_supported() ) {
/* translators: %s: database table name */ /* 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.0.0' ); _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 false;
} }
@ -1499,7 +1499,7 @@ function add_site_meta( $site_id, $meta_key, $meta_value, $unique = false ) {
* value, will keep from removing duplicate metadata with the same key. It also * value, will keep from removing duplicate metadata with the same key. It also
* allows removing all metadata matching key, if needed. * allows removing all metadata matching key, if needed.
* *
* @since 5.0.0 * @since 5.1.0
* *
* @param int $site_id Site ID. * @param int $site_id Site ID.
* @param string $meta_key Metadata name. * @param string $meta_key Metadata name.
@ -1511,7 +1511,7 @@ function delete_site_meta( $site_id, $meta_key, $meta_value = '' ) {
// Bail if site meta table is not installed. // Bail if site meta table is not installed.
if ( ! is_site_meta_supported() ) { if ( ! is_site_meta_supported() ) {
/* translators: %s: database table name */ /* 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.0.0' ); _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 false;
} }
@ -1528,7 +1528,7 @@ function delete_site_meta( $site_id, $meta_key, $meta_value = '' ) {
/** /**
* Retrieves metadata for a site. * Retrieves metadata for a site.
* *
* @since 5.0.0 * @since 5.1.0
* *
* @param int $site_id Site ID. * @param int $site_id Site ID.
* @param string $key Optional. The meta key to retrieve. By default, returns * @param string $key Optional. The meta key to retrieve. By default, returns
@ -1541,7 +1541,7 @@ function get_site_meta( $site_id, $key = '', $single = false ) {
// Bail if site meta table is not installed. // Bail if site meta table is not installed.
if ( ! is_site_meta_supported() ) { if ( ! is_site_meta_supported() ) {
/* translators: %s: database table name */ /* 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.0.0' ); _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 false;
} }
@ -1556,7 +1556,7 @@ function get_site_meta( $site_id, $key = '', $single = false ) {
* *
* If the meta field for the site does not exist, it will be added. * If the meta field for the site does not exist, it will be added.
* *
* @since 5.0.0 * @since 5.1.0
* *
* @param int $site_id Site ID. * @param int $site_id Site ID.
* @param string $meta_key Metadata key. * @param string $meta_key Metadata key.
@ -1570,7 +1570,7 @@ function update_site_meta( $site_id, $meta_key, $meta_value, $prev_value = '' )
// Bail if site meta table is not installed. // Bail if site meta table is not installed.
if ( ! is_site_meta_supported() ) { if ( ! is_site_meta_supported() ) {
/* translators: %s: database table name */ /* 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.0.0' ); _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 false;
} }
@ -1587,7 +1587,7 @@ function update_site_meta( $site_id, $meta_key, $meta_value, $prev_value = '' )
/** /**
* Deletes everything from site meta matching meta key. * Deletes everything from site meta matching meta key.
* *
* @since 5.0.0 * @since 5.1.0
* *
* @param string $meta_key Metadata key to search for when deleting. * @param string $meta_key Metadata key to search for when deleting.
* @return bool Whether the site meta key was deleted from the database. * @return bool Whether the site meta key was deleted from the database.
@ -1596,7 +1596,7 @@ function delete_site_meta_by_key( $meta_key ) {
// Bail if site meta table is not installed. // Bail if site meta table is not installed.
if ( ! is_site_meta_supported() ) { if ( ! is_site_meta_supported() ) {
/* translators: %s: database table name */ /* 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.0.0' ); _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 false;
} }

4
wp-includes/version.php
View File

@ -13,14 +13,14 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.1-alpha-44466'; $wp_version = '5.1-alpha-44467';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 43764; $wp_db_version = 44467;
/** /**
* Holds the TinyMCE version * Holds the TinyMCE version

2
wp-includes/wp-db.php
View File

@ -417,7 +417,7 @@ class wpdb {
/** /**
* Multisite Blog Metadata table * Multisite Blog Metadata table
* *
* @since 5.0.0 * @since 5.1.0
* @var string * @var string
*/ */
public $blogmeta; public $blogmeta;