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

Multisite: Remove the output parameter from `get_site()` 

Full `WP_Site` objects should be expected from `get_site()` rather than arrays.

In the single (soon to be deprecated) use of arrays for this in core, we can cast the result to `(array)` for back-compat.

See #35791.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37618 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-06-08 02:48:30 +00:00
parent d75f77a410
commit 75a851a3aa
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -479,11 +479,10 @@ function clean_blog_cache( $blog ) {
*
* @global WP_Site $current_blog The current site.
*
* @param WP_Site|int $site Site to retrieve.
* @param string $output Optional. Type of output to return. OBJECT or ARRAY_A or ARRAY_N constants.
* @param WP_Site|int $site Site to retrieve.
* @return WP_Site|array|null Depends on $output value.
*/
function get_site( &$site = null, $output = OBJECT ) {
function get_site( &$site = null ) {
global $current_blog;
if ( empty( $site ) && isset( $current_blog ) ) {
$site = $current_blog;
@ -510,14 +509,6 @@ function get_site( &$site = null, $output = OBJECT ) {
*/
$_site = apply_filters( 'get_site', $_site );
if ( $output == OBJECT ) {
return $_site;
} elseif ( $output == ARRAY_A ) {
return $_site->to_array();
} elseif ( $output == ARRAY_N ) {
return array_values( $_site->to_array() );
}
return $_site;
}

2
wp-includes/ms-functions.php
View File

@ -2488,7 +2488,7 @@ function wp_get_sites( $args = array() ) {
$results = array();
foreach ( $_sites as $_site ) {
$results[] = get_site( $_site, ARRAY_A );
$results[] = (array) get_site( $_site );
}
return $results;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-alpha-37651';
$wp_version = '4.6-alpha-37652';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.