IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Roles/Capabilities: Add a new wp_roles_init filter.

Browse Source 
Historically, it's been difficult to extend user roles, but reasonable to work around by waiting until after `init` has fired, to add custom roles and capabilities. With the addition of Locale Switching, Core now potentially loads roles before `init` has fired, leaving a window where custom roles and capabilities are not handled.

The new filter allows plugins to add their own custom roles whenever they're initialised (on page load, or when switching sites, for example), so that they can always be obeyed.

`WP_Roles` has also been tidied up a little bit, to remove duplicate code.

Props johnjamesjacoby, pento.
Fixes #23016.


Built from https://develop.svn.wordpress.org/trunk@39082


git-svn-id: http://core.svn.wordpress.org/trunk@39024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast
2016-11-02 00:31:32 +00:00
parent 4b3a9de5b5
commit e79fa03329
3 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/ms-blogs.php
View File

@@ -766,7 +766,7 @@ function update_blog_option( $id, $option, $value, $deprecated = null ) {
* @return true Always returns True.
*/
function switch_to_blog( $new_blog, $deprecated = null ) {
global $wpdb;
global $wpdb, $wp_roles;
$blog_id = get_current_blog_id();
if ( empty( $new_blog ) ) {
@@ -822,7 +822,7 @@ function switch_to_blog( $new_blog, $deprecated = null ) {
}
if ( did_action( 'init' ) ) {
wp_roles()->reinit();
$wp_roles = new WP_Roles();
$current_user = wp_get_current_user();
$current_user->for_blog( $new_blog );
}
@@ -850,7 +850,7 @@ function switch_to_blog( $new_blog, $deprecated = null ) {
* @return bool True on success, false if we're already on the current blog
*/
function restore_current_blog() {
global $wpdb;
global $wpdb, $wp_roles;
if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
return false;
@@ -896,7 +896,7 @@ function restore_current_blog() {
}
if ( did_action( 'init' ) ) {
wp_roles()->reinit();
$wp_roles = new WP_Roles();
$current_user = wp_get_current_user();
$current_user->for_blog( $blog );
}