Changeset 8759

Timestamp:

08/05/2014 04:23:56 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Bring bp_get_blog_avatar() up to speed with bp_get_group_avatar():

• Add inline doc
• Use bp_parse_args()
• Add brackets and bring code formatting up to date

File:

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

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

@@ -479 +479 @@
      *     @type int|bool $height Default: false.
      *     @type bool $id Currently unused.
-     *     @type bool $no_grav Default: false.
+     *     @type bool $no_grav Default: true.
      * }
      * @return string User avatar string.
@@ -486 +486 @@
         global $blogs_template;
 
-        $defaults = array(
+        // Parse the arguments
+        $r = bp_parse_args( $args, array(
             'type'    => 'full',
             'width'   => false,
@@ -493 +494 @@
             'id'      => false,
             'alt'     => sprintf( __( 'Profile picture of site author %s', 'buddypress' ), bp_core_get_user_displayname( $blogs_template->blog->admin_user_id ) ),
-            'no_grav' => true
-        );
-
-        $r = wp_parse_args( $args, $defaults );
-        extract( $r, EXTR_SKIP );
+            'no_grav' => true,
+        ) );
+
+        // Fetch the avatar
+        $avatar = bp_core_fetch_avatar( array(
+            'item_id'    => $blogs_template->blog->admin_user_id,
+            'title'      => $blogs_template->blog->admin_user_email,
+            //'avatar_dir' => 'blog-avatars',
+            //'object'     => 'blog',
+            'type'       => $r['type'],
+            'alt'        => $r['alt'],
+            'css_id'     => $r['id'],
+            'class'      => $r['class'],
+            'width'      => $r['width'],
+            'height'     => $r['height']
+        ) );
 
         /***
@@ -507 +519 @@
          * Use the 'bp_get_blog_avatar' filter instead.
          */
-        $avatar = apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, bp_core_fetch_avatar( array( 'item_id' => $blogs_template->blog->admin_user_id, 'type' => $type, 'alt' => $alt, 'width' => $width, 'height' => $height, 'class' => $class, 'email' => $blogs_template->blog->admin_user_email ) ) );
-
-        return apply_filters( 'bp_get_blog_avatar', $avatar, $blogs_template->blog->blog_id, array( 'item_id' => $blogs_template->blog->admin_user_id, 'type' => $type, 'alt' => $alt, 'width' => $width, 'height' => $height, 'class' => $class, 'email' => $blogs_template->blog->admin_user_email ) );
+        $avatar = apply_filters( 'bp_get_blog_avatar_' . $blogs_template->blog->blog_id, $avatar );
+
+        return apply_filters( 'bp_get_blog_avatar', $avatar, $blogs_template->blog->blog_id, $r );
     }