WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

REST API: Fire correct hooks when creating users on multiste. 

`add_user_to_blog()` is now called, ensuring the correct hooks are called, along with setting the primary blog and clearing relevant caches.

Props jeremyfelt.
Fixes #38526.

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


git-svn-id: http://core.svn.wordpress.org/trunk@39117 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan McCue 2016-11-09 01:35:30 +00:00
parent fa4cbf29f1
commit 4060c68f85
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
View File

@ -434,6 +434,8 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
if ( is_wp_error( $user_id ) ) { if ( is_wp_error( $user_id ) ) {
return $user_id; return $user_id;
} }
add_user_to_blog( get_site()->id, $user_id, '' );
} else { } else {
$user_id = wp_insert_user( $user ); $user_id = wp_insert_user( $user );
@ -558,6 +560,10 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
$user = get_user_by( 'id', $id ); $user = get_user_by( 'id', $id );
if ( is_multisite() && ! is_user_member_of_blog( $id ) ) {
add_user_to_blog( get_current_blog_id(), $id, '' );
}
if ( ! empty( $request['roles'] ) ) { if ( ! empty( $request['roles'] ) ) {
array_map( array( $user, 'add_role' ), $request['roles'] ); array_map( array( $user, 'add_role' ), $request['roles'] );
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-beta2-39176'; $wp_version = '4.7-beta2-39177';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.