Ticket #3133: 3133.patch

wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-committers.php

@@ -91 +91 @@
 
         function add_committer( $request ) {
                 $user = new WP_User( $request['committer'] );
-                if ( ! $user->exists() ) {
+
+                // If user_login is not found, try searching by user_nicename.
+                if ( ! $user || ! $user->exists() ) {
+                        $user = get_user_by( 'slug', $request['committer'] );
+                }
+
+                // If user_nicename is not found, try searching by user_email.
+                if ( ! $user || ! $user->exists() ) {
+                        $user = get_user_by( 'email', $request['committer'] );
+                }
+
+                if ( ! $user || ! $user->exists() ) {
                         return new WP_Error( 'plugin_user_not_found', __( 'The provided user could not be found.', 'wporg-plugins' ) );
                 }
 
@@ -106 +117 @@
 
         function revoke_committer( $request ) {
                 $user = new WP_User( $request['committer'] );
-                if ( ! $user->exists() ) {
+
+                // If user_login is not found, try searching by user_nicename.
+                if ( ! $user || ! $user->exists() ) {
+                        $user = get_user_by( 'slug', $request['committer'] );
+                }
+
+                // If user_nicename is not found, try searching by user_email.
+                if ( ! $user || ! $user->exists() ) {
+                        $user = get_user_by( 'email', $request['committer'] );
+                }
+
+                if ( ! $user || ! $user->exists() ) {
                         return new WP_Error( 'plugin_user_not_found', __( 'The provided user could not be found.', 'wporg-plugins' ) );
                 }
 

wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-support-reps.php

@@ -91 +91 @@
 
         function add_support_rep( $request ) {
                 $user = new WP_User( $request['support_rep'] );
-                if ( ! $user->exists() ) {
+
+                // If user_login is not found, try searching by user_nicename.
+                if ( ! $user || ! $user->exists() ) {
+                        $user = get_user_by( 'slug', $request['support_rep'] );
+                }
+
+                // If user_nicename is not found, try searching by user_email.
+                if ( ! $user || ! $user->exists() ) {
+                        $user = get_user_by( 'email', $request['support_rep'] );
+                }
+
+                if ( ! $user || ! $user->exists() ) {
                         return new WP_Error( 'plugin_user_not_found', __( 'The provided user could not be found.', 'wporg-plugins' ) );
                 }
 
@@ -106 +117 @@
 
         function remove_support_rep( $request ) {
                 $user = new WP_User( $request['support_rep'] );
-                if ( ! $user->exists() ) {
+
+                // If user_login is not found, try searching by user_nicename.
+                if ( ! $user || ! $user->exists() ) {
+                        $user = get_user_by( 'slug', $request['support_rep'] );
+                }
+
+                // If user_nicename is not found, try searching by user_email.
+                if ( ! $user || ! $user->exists() ) {
+                        $user = get_user_by( 'email', $request['support_rep'] );
+                }
+
+                if ( ! $user || ! $user->exists() ) {
                         return new WP_Error( 'plugin_user_not_found', __( 'The provided user could not be found.', 'wporg-plugins' ) );
                 }