Ticket #2828: 2828.3.diff

src/includes/core/template-functions.php

@@ -468 +468 @@
  * @param WP_Query $posts_query
  *
  * @uses get_query_var() To get {@link WP_Query} query var
- * @uses is_email() To check if the string is an email
- * @uses get_user_by() To try to get the user by email and nicename
+ * @uses get_user_by() To try to get the user by nicename or id
  * @uses get_userdata() to get the user data
  * @uses current_user_can() To check if the current user can edit the user
  * @uses is_user_member_of_blog() To check if user profile page exists
@@ -511 +510 @@
                 // Setup the default user variable
                 $the_user = false;
 
-                // If using pretty permalinks, use the email or slug
+                // If using pretty permalinks, use the slug
                 if ( get_option( 'permalink_structure' ) ) {
+                        $the_user = get_user_by( 'slug', $bbp_user );
 
-                        // Email was passed
-                        if ( is_email( $bbp_user ) ) {
-                                $the_user = get_user_by( 'email', $bbp_user );
-
-                        // Try nicename
-                        } else {
-                                $the_user = get_user_by( 'slug', $bbp_user );
-                        }
-                }
-
-                // No user found by slug/email, so try the ID if it's numeric
-                if ( empty( $the_user ) && is_numeric( $bbp_user ) ) {
+                // If not using permalinks, get the user by ID
+                } elseif ( is_numeric( $bbp_user ) ) {
                         $the_user = get_user_by( 'id', $bbp_user );
                 }