Ticket #4333: 4333.diff

bp-members/bp-members-template.php

@@ -770 +770 @@
         function bp_get_loggedin_user_avatar( $args = '' ) {
 
                 $defaults = array(
-                        'type'   => 'thumb',
-                        'width'  => false,
-                        'height' => false,
-                        'html'   => true,
-                        'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_loggedin_user_fullname() )
+                        'item_id' => bp_loggedin_user_id(),
+                        'type'    => 'thumb',
+                        'width'   => false,
+                        'height'  => false,
+                        'html'    => true,
+                        'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_loggedin_user_fullname() )
                 );
 
-                $r = wp_parse_args( $args, $defaults );
-                extract( $r, EXTR_SKIP );
+                $avatar_args = wp_parse_args( $args, $defaults );
 
-                return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => bp_loggedin_user_id(), 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
+                return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( $avatar_args ) );
         }
 
 function bp_displayed_user_avatar( $args = '' ) {
@@ -789 +789 @@
         function bp_get_displayed_user_avatar( $args = '' ) {
 
                 $defaults = array(
-                        'type'   => 'thumb',
-                        'width'  => false,
-                        'height' => false,
-                        'html'   => true,
-                        'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
+                        'item_id' => bp_displayed_user_id(),
+                        'type'    => 'thumb',
+                        'width'   => false,
+                        'height'  => false,
+                        'html'    => true,
+                        'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
                 );
 
-                $r = wp_parse_args( $args, $defaults );
-                extract( $r, EXTR_SKIP );
+                $avatar_args = wp_parse_args( $args, $defaults );
 
-                return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( array( 'item_id' => bp_displayed_user_id(), 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
+                return apply_filters( 'bp_get_displayed_user_avatar', bp_core_fetch_avatar( $avatar_args ) );
         }
 
 function bp_displayed_user_email() {