Changeset 30255

Timestamp:

11/06/2014 08:08:00 AM (10 years ago)

Author:

nacin

Message:

Create new $wp_roles object in install_blog() to avoid protected _init() call

Merges [30242] to the 4.0 branch.

Our call to $wp_roles->_init() relied on the __call() method in WP_Roles to handle the link to the protected method. This works back to PHP 5.2.9, when a bug was fixed allowing access to protected methods through this exact approach.

install_blog() needs a fresh $wp_roles object after populate_roles() resets everything in its path. We can create this new object from scratch, effectively doing the same thing with the call to _init() via the constructor.

props jeremyfelt.
fixes #29692.

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• 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 );