From 856b9e31d58a6a4aaf5ed3ac3485f05ceff3ab27 Mon Sep 17 00:00:00 2001 From: Felix Arntz Date: Wed, 30 Aug 2017 19:52:59 +0000 Subject: [PATCH] Multisite: Remove an unnecessary if clause wrapping the `added_existing_user` filter. 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 --- src/wp-includes/ms-functions.php | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php index 7c28844e0c..42e4f04110 100644 --- a/src/wp-includes/ms-functions.php +++ b/src/wp-includes/ms-functions.php @@ -2110,17 +2110,16 @@ function add_existing_user_to_blog( $details = false ) { $blog_id = get_current_blog_id(); $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. - * - * @since MU (3.0.0) - * - * @param int $user_id User ID. - * @param mixed $result True on success or a WP_Error object if the user doesn't exist. - */ - do_action( 'added_existing_user', $details['user_id'], $result ); - } + /** + * Fires immediately after an existing user is added to a site. + * + * @since MU (3.0.0) + * + * @param int $user_id User ID. + * @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 ); return $result; }