Changeset 37652 for trunk/src

Timestamp:

06/08/2016 02:47:48 AM (10 years ago)

Author:

jeremyfelt

Message:

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.

Location:

trunk/src/wp-includes

Files:

• ms-blogs.php (modified) (2 diffs)
• ms-functions.php (modified) (1 diff)

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

@@ -480 +480 @@
  * @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 ) ) {
@@ -510 +509 @@
          */
         $_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;

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

@@ -2489 +2489 @@
 
         foreach ( $_sites as $_site ) {
-                $results[] = get_site( $_site, ARRAY_A );
+                $results[] = (array) get_site( $_site );
         }