Changeset 22108 for trunk/wp-includes/ms-blogs.php

Timestamp:

10/04/2012 12:40:09 PM (14 years ago)

Author:

ryan

Message:

Reduce use of global. Use get_blog_details() instead. fixes #22090

File:

• trunk/wp-includes/ms-blogs.php (modified) (2 diffs)

trunk/wp-includes/ms-blogs.php

@@ -119 +119 @@
  * @since MU
  *
- * @param int|string|array $fields A blog ID, a blog slug, or an array of fields to query against.
+ * @param int|string|array $fields A blog ID, a blog slug, or an array of fields to query against. Optional. If not specified the current blog ID is used.
  * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true.
  * @return object Blog details.
  */
-function get_blog_details( $fields, $get_all = true ) {
+function get_blog_details( $fields = null, $get_all = true ) {
         global $wpdb;
 
@@ -167 +167 @@
                 }
         } else {
-                if ( !is_numeric( $fields ) )
+                if ( ! $fields )
+                        $blog_id = get_current_blog_id();
+                elseif ( ! is_numeric( $fields ) )
                         $blog_id = get_id_from_blogname( $fields );
                 else