sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests 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.


git-svn-id: https://develop.svn.wordpress.org/trunk@37652 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt 2016-06-08 02:47:48 +00:00
parent 727a94b710
commit 53ec2e744d
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wp-includes/ms-blogs.php
View File

@ -480,10 +480,9 @@ function clean_blog_cache( $blog ) {
* @global WP_Site $current_blog The current site. * @global WP_Site $current_blog The current site.
* *
* @param WP_Site|int $site Site to retrieve. * @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.
* @return WP_Site|array|null Depends on $output value. * @return WP_Site|array|null Depends on $output value.
*/ */
function get_site( &$site = null, $output = OBJECT ) { function get_site( &$site = null ) {
global $current_blog; global $current_blog;
if ( empty( $site ) && isset( $current_blog ) ) { if ( empty( $site ) && isset( $current_blog ) ) {
$site = $current_blog; $site = $current_blog;
@ -510,14 +509,6 @@ function get_site( &$site = null, $output = OBJECT ) {
*/ */
$_site = apply_filters( 'get_site', $_site ); $_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; return $_site;
} }

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

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