Changes from trunk/src/wp-includes/ms-functions.php at r28835 to branches/4.0/src/wp-includes/ms-functions.php at r30255

File:

• branches/4.0/src/wp-includes/ms-functions.php (modified) (1 diff)

branches/4.0/src/wp-includes/ms-functions.php

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