Changeset 12177

Timestamp:

06/19/2018 02:22:35 AM (6 years ago)

Author:

boonebgorges

Message:

Remove unreachable code in deprecated avatar functions.

The checks for the existence of bp_core_fetch_avatar() have not
been needed since [1636], when the function was introduced.

Props xknown.
Fixes #7902.

File:

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

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

@@ -193 +193 @@
     global $comment;
 
-    if ( function_exists( 'bp_core_fetch_avatar' ) ) {
-        echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array(
-            'item_id' => $comment->user_id,
-            'type'    => 'thumb',
-            'alt'     => sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $comment->user_id ) )
-        ) ) );
-    } elseif ( function_exists( 'get_avatar' ) ) {
-        get_avatar();
-    }
+    echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array(
+        'item_id' => $comment->user_id,
+        'type'    => 'thumb',
+        'alt'     => sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $comment->user_id ) )
+    ) ) );
 }
 
@@ -212 +208 @@
     global $post;
 
-    if ( function_exists( 'bp_core_fetch_avatar' ) ) {
-        echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array(
-            'item_id' => $post->post_author,
-            'type'    => 'thumb',
-            'alt'     => sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $post->post_author ) )
-        ) ) );
-    } elseif ( function_exists( 'get_avatar' ) ) {
-        get_avatar();
-    }
+    echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array(
+        'item_id' => $post->post_author,
+        'type'    => 'thumb',
+        'alt'     => sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $post->post_author ) )
+    ) ) );
 }