From 70daaadc6ab837ce86f2098a2f4e21723f548204 Mon Sep 17 00:00:00 2001
From: Felix Arntz <felix-arntz@leaves-and-love.net>
Date: Wed, 30 Aug 2017 19:53:45 +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.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-functions.php | 21 ++++++++++-----------
 wp-includes/version.php      |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 7c28844e0c..42e4f04110 100644
--- a/wp-includes/ms-functions.php
+++ b/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;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 5c6f72a14e..bc39f32343 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41323';
+$wp_version = '4.9-alpha-41324';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.