sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Multisite: Remove an unnecessary if clause wrapping the added_existing_user filter.

Browse Source 
This was accidentally introduced in [41125]. Since the `added_existing_user` filter has historically accepted either `true` or a `WP_Error` object, the clause is not necessary here. The doc block has been adjusted to account for the new possible `WP_Error` condition.

Fixes #41101.


git-svn-id: https://develop.svn.wordpress.org/trunk@41324 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz 2017-08-30 19:52:59 +00:00
parent 06329dc35e
commit 856b9e31d5
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-includes/ms-functions.php
View File

@ -2110,17 +2110,16 @@ function add_existing_user_to_blog( $details = false ) {
$blog_id = get_current_blog_id(); $blog_id = get_current_blog_id();
$result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] ); $result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
if ( ! is_wp_error( $result ) ) {
/** /**
* Fires immediately after an existing user is added to a site. * Fires immediately after an existing user is added to a site.
* *
* @since MU (3.0.0) * @since MU (3.0.0)
* *
* @param int $user_id User ID. * @param int $user_id User ID.
* @param mixed $result True on success or a WP_Error object if the user doesn't exist. * @param mixed $result True on success or a WP_Error object if the user doesn't exist
* or could not be added.
*/ */
do_action( 'added_existing_user', $details['user_id'], $result ); do_action( 'added_existing_user', $details['user_id'], $result );
}
return $result; return $result;
} }