Ticket #3500: 3500.03.patch

bp-activity/bp-activity-template.php

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

bp-themes/bp-default/activity/entry.php

@@ -18 +18 @@
         <div class="activity-avatar">
                 <a href="<?php bp_activity_user_link(); ?>">
 
-                        <?php bp_activity_avatar( 'type=thumb' ); ?>
+                        <?php bp_activity_avatar(); ?>
 
                 </a>
         </div>