Ticket #29692: 29692.2.diff

src/wp-includes/ms-functions.php

@@ -1379 +1379 @@
         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 );