Changeset 9804

Timestamp:

04/25/2015 08:37:51 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Members: Improve logged-in and displayed user avatar functions:

• Remove extract() usages
• Pass $r and $args into filters
• Pass $r into bp_core_fetch_avatar() enabling interaction with other parameter arguments

Fixes #6392.

File:

• trunk/src/bp-members/bp-members-template.php (modified) (4 diffs)

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

@@ -1437 +1437 @@
     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() )
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
+        $r = wp_parse_args( $args, array(
+            '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() )
+        ) );
 
         /**
@@ -1455 +1453 @@
          * @param string $value User avatar string.
          */
-        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( $r ), $r, $args );
     }
 
@@ -1486 +1484 @@
     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() )
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
+        $r = wp_parse_args( $args, array(
+            '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() )
+        ) );
 
         /**
@@ -1504 +1500 @@
          * @param string $value User avatar string.
          */
-        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( $r ), $r, $args );
     }