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 6d7a2fbd52bef85c4778fa4a40d19fdfed60bddd..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();
-       $wp_roles->_init();
+
+       // populate_roles() clears previous role definitions so we start over.
+       $wp_roles = new WP_Roles();
 
        $url = untrailingslashit( $url );