Changeset 5930 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-committers.php

Timestamp:

09/16/2017 06:23:16 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: Allow for adding committers and support reps by a slug or email, as the input suggests.

Fixes #3133. See #3029.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-committers.php (modified) (2 diffs)

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

@@ -92 +92 @@
     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' ) );
         }
@@ -107 +118 @@
     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' ) );
         }