Changeset 11260

Timestamp:

09/29/2021 04:35:15 AM (5 years ago)

Author:

dd32

Message:

Plugin Directory: Fix a fatal error when processing plugin directory emails (adding a committer, transferring ownership, closing, etc) when a plugin committer has a email-like user_login (which unfortunately do exist on WordPress.org).

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-base.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/email/class-base.php

@@ -48 +48 @@
         foreach ( (array) $users as $user ) {
             if ( is_string( $user ) && is_email( $user ) ) {
-                $user = get_user_by( 'email', $user );
-            } elseif ( ! ( $user instanceof WP_User ) ) {
+                $email_user = get_user_by( 'email', $user );
+                if ( $email_user ) {
+                    $user = $email_user;
+                }
+            }
+
+            if ( ! ( $user instanceof WP_User ) ) {
+                // ID, login (which may be email-like)
                 $user = new WP_User( $user );
             }
 
-            if ( $user->exists() ) {
+            if ( $user && $user->exists() ) {
                 $this->users[] = $user;
             }