Changeset 11633

Timestamp:

07/10/2017 05:34:25 PM (9 years ago)

Author:

r-a-y

Message:

Avatars: After r11627, move email check after user object checks.

Avoids notices from occurring.

See #7424.

File:

• trunk/src/bp-core/bp-core-avatars.php (modified) (2 diffs)

trunk/src/bp-core/bp-core-avatars.php

@@ -1378 +1378 @@
     if ( is_numeric( $id_or_email ) ) {
         $user = get_user_by( 'id', absint( $id_or_email ) );
-    } elseif ( is_email( $id_or_email ) ) {
-        $user = get_user_by( 'email', $id_or_email );
     } elseif ( $id_or_email instanceof WP_User ) {
         // User Object
@@ -1388 +1386 @@
     } elseif ( $id_or_email instanceof WP_Comment && ! empty( $id_or_email->user_id ) ) {
         $user = get_user_by( 'id', (int) $id_or_email->user_id );
+    } elseif ( is_email( $id_or_email ) ) {
+        $user = get_user_by( 'email', $id_or_email );
     }