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

Users: In `remove_user_from_blog()`: 

* Change default value of the `$blog_id` parameter to match the documented type.
* Change the type of the `$reassign` parameter for consistency with `$user_id` and `$blog_id`.
* Add documentation for the return value.

See #49361.
Built from https://develop.svn.wordpress.org/trunk@47173


git-svn-id: http://core.svn.wordpress.org/trunk@46973 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-02-04 19:36:04 +00:00
parent e956bbebe1
commit be057c4a1c
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/network/users.php
View File

@ -158,7 +158,7 @@ if ( isset( $_GET['action'] ) ) {
}
if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][ $blogid ][ $id ] ) {
remove_user_from_blog( $id, $blogid, $user_id );
remove_user_from_blog( $id, $blogid, (int) $user_id );
} else {
remove_user_from_blog( $id, $blogid );
}

18
wp-includes/ms-functions.php
View File

@ -234,15 +234,17 @@ function add_user_to_blog( $blog_id, $user_id, $role ) {
*
* @global wpdb $wpdb WordPress database abstraction object.
*
* @param int $user_id ID of the user you're removing.
* @param int $blog_id ID of the blog you're removing the user from.
* @param string $reassign Optional. A user to whom to reassign posts.
* @return true|WP_Error
* @param int $user_id ID of the user you're removing.
* @param int $blog_id Optional. ID of the blog you're removing the user from. Default 0.
* @param int $reassign Optional. ID of the user to whom to reassign posts. Default 0.
* @return true|WP_Error True on success or a WP_Error object if the user doesn't exist.
*/
function remove_user_from_blog( $user_id, $blog_id = '', $reassign = '' ) {
function remove_user_from_blog( $user_id, $blog_id = 0, $reassign = 0 ) {
global $wpdb;
switch_to_blog( $blog_id );
$user_id = (int) $user_id;
/**
* Fires before a user is removed from a site.
*
@ -253,8 +255,8 @@ function remove_user_from_blog( $user_id, $blog_id = '', $reassign = '' ) {
*/
do_action( 'remove_user_from_blog', $user_id, $blog_id );
// If being removed from the primary blog, set a new primary if the user is assigned
// to multiple blogs.
// If being removed from the primary blog, set a new primary
// if the user is assigned to multiple blogs.
$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
if ( $primary_blog == $blog_id ) {
$new_id = '';
@ -288,7 +290,7 @@ function remove_user_from_blog( $user_id, $blog_id = '', $reassign = '' ) {
update_user_meta( $user_id, 'source_domain', '' );
}
if ( $reassign != '' ) {
if ( $reassign ) {
$reassign = (int) $reassign;
$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id ) );
$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id ) );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.4-alpha-47172';
$wp_version = '5.4-alpha-47173';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.