Changeset 4849 for trunk/bp-activity/bp-activity-template.php

Timestamp:

07/25/2011 07:55:01 PM (15 years ago)

Author:

djpaul

Message:

Align avatars in members' activity streams. Fixes #3364

File:

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

trunk/bp-activity/bp-activity-template.php

@@ -563 +563 @@
          */
         function bp_get_activity_avatar( $args = '' ) {
-                global $bp, $activities_template;
+                global $activities_template, $bp;
 
                 $defaults = array(
+                        'alt'     => __( 'Profile picture of %s', 'buddypress' ),
+                        'class'   => 'avatar',
+                        'email'   => false,
                         'type'    => 'thumb',
-                        'width'   => 20,
-                        'height'  => 20,
-                        'class'   => 'avatar',
-                        'alt'     => __( 'Profile picture of %s', 'buddypress' ),
-                        'email'   => false,
                         'user_id' => false
                 );
@@ -577 +575 @@
                 $r = wp_parse_args( $args, $defaults );
                 extract( $r, EXTR_SKIP );
+
+                if ( !isset( $height ) && !isset( $width ) ) {  // Backpat
+                        if ( 'full' == $type ) {
+                                $height = $bp->avatar->full->height;
+                                $width  = $bp->avatar->full->width;
+
+                        } elseif ( 'thumb' == $type ) {
+                                $height = $bp->avatar->thumb->height;
+                                $width  = $bp->avatar->thumb->width;
+                        }
+                }
+
+                // Backpat
+                if ( !isset( $width ) )
+                        $width = 20;
+
+                if ( !isset( $height ) )
+                        $height = 20;
 
                 // Within the loop, we the current activity should be set first to the