WordPress 4.0.1

[autoinstalls/wordpress.git] / wp-includes / ms-functions.php

diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 431ba070aaf4ae5a3b6e8596b0f2b0d93ff5cb86..e799bc019d3feaf7eef174e83a26e679103812a4 100644 (file)
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1379,7 +1379,9 @@ function install_blog( $blog_id, $blog_title = '' ) {
        make_db_current_silent( 'blog' );
        populate_options();
        populate_roles();
        make_db_current_silent( 'blog' );
        populate_options();
        populate_roles();

-       $wp_roles->_init();
+
+       // populate_roles() clears previous role definitions so we start over.
+       $wp_roles = new WP_Roles();

 
        $url = untrailingslashit( $url );
 
 
        $url = untrailingslashit( $url );
 


@@ -1761,7 +1763,7 @@ function check_upload_mimes( $mimes ) {
  * WordPress MS stores a blog's post count as an option so as
  * to avoid extraneous COUNTs when a blog's details are fetched
  * with get_blog_details(). This function is called when posts
  * WordPress MS stores a blog's post count as an option so as
  * to avoid extraneous COUNTs when a blog's details are fetched
  * with get_blog_details(). This function is called when posts

- * are published to make sure the count stays current.
+ * are published or unpublished to make sure the count stays current.

  *
  * @since MU
  */
  *
  * @since MU
  */


@@ -2078,11 +2080,9 @@ function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
        global $wpdb;
 
        $current_user = wp_get_current_user();
        global $wpdb;
 
        $current_user = wp_get_current_user();

-       if ( $user_id == 0 )
-               $user_id = $current_user->ID;
-       if ( $blog_id == 0 )
+       if ( $blog_id == 0 ) {

                $blog_id = $wpdb->blogid;
                $blog_id = $wpdb->blogid;

-
+       }

        $local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
 
        if ( isset( $current_user->$local_key ) )
        $local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
 
        if ( isset( $current_user->$local_key ) )