Ticket #35697: 35697.diff

src/wp-includes/ms-functions.php

@@ -2444 +2444 @@
                 'deleted'    => null,
                 'limit'      => 100,
                 'offset'     => 0,
+                'fields'     => 'all',
         );
 
         $args = wp_parse_args( $args, $defaults );
 
-        $query = "SELECT * FROM $wpdb->blogs WHERE 1=1 ";
+        $selects = array();
+        switch ( $args['fields'] ) {
+                case 'all':
+                        $selects = array( '*' );
+                        break;
+                case 'ids':
+                        $selects = array( 'blog_id' );
+                        break;
+                case 'count':
+                        $selects = array( 'COUNT(*)' );
+                        break;
+                case 'id=>domain':
+                        $selects = array( 'blog_id', 'domain' );
+                        break;
+                case 'id=>path':
+                        $selects = array( 'blog_id', 'path' );
+                        break;
+                case 'id=>network_id':
+                        $selects = array( 'blog_id', 'site_id' );
+                        break;
+        }
 
+        $fields = implode( ', ', $selects );
+
+        $query = "SELECT $fields FROM $wpdb->blogs WHERE 1=1 ";
+
         if ( isset( $args['network_id'] ) && ( is_array( $args['network_id'] ) || is_numeric( $args['network_id'] ) ) ) {
                 $network_ids = implode( ',', wp_parse_id_list( $args['network_id'] ) );
                 $query .= "AND site_id IN ($network_ids) ";
@@ -2477 +2502 @@
                         $query .= $wpdb->prepare( "LIMIT %d ", $args['limit'] );
         }
 
+        if ( 'count' === $args['fields'] ) {
+                return $wpdb->get_var( $query );
+        }
+
         $site_results = $wpdb->get_results( $query, ARRAY_A );
 
+        $_site_results = array();
+        if ( 'id=>domain' === $args['fields'] ) {
+                foreach ( $site_results as $site ) {
+                        $_site_results[ $site['blog_id'] ] = $site['domain'];
+                }
+        } elseif ( 'id=>path' === $args['fields'] ) {
+                foreach ( $site_results as $site ) {
+                        $_site_results[ $site['blog_id'] ] = $site['path'];
+                }
+        } elseif ( 'id=>network_id' === $args['fields'] ) {
+                foreach ( $site_results as $site ) {
+                        $_site_results[ $site['blog_id'] ] = $site['site_id'];
+                }
+        } elseif ( 'ids' === $args['fields'] ) {
+                foreach ( $site_results as $site ) {
+                        $_site_results[] = $site['blog_id'];
+                }
+        }
+
+        if ( ! empty( $_site_results ) ) {
+                $site_results = $_site_results;
+        }
+
         return $site_results;
 }