Changeset 41324

Timestamp:

08/30/2017 07:52:59 PM (9 years ago)

Author:

flixos90

Message:

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.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (1 diff)

trunk/src/wp-includes/ms-functions.php

@@ -2111 +2111 @@
                 $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;