Changeset 5019

Timestamp:

08/20/2011 02:33:05 PM (13 years ago)

Author:

boonebgorges

Message:

Load the full-size avatar image on activity permalink pages. Refactor avatar height/width fallbacks to make the code clearer. Fixes #3500. Props Jonnyauk

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (2 diffs)
• bp-themes/bp-default/activity/entry.php (modified) (1 diff)

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

@@ -566 +566 @@
         global $activities_template, $bp;
 
+        // On activity permalink pages, default to the full-size avatar
+        $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
         );
@@ -577 +580 @@
         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 ) ) {
+            // Backpat
+            if ( isset( $bp->avatar->full->height ) || isset( $bp->avatar->thumb->height ) ) {
+                $height = ( 'full' == $type ) ? $bp->avatar->full->height : $bp->avatar->thumb->height;
+            } else {
+                $height = 20;
             }
+
+            // Backpat
+            if ( isset( $bp->avatar->full->width ) || isset( $bp->avatar->thumb->width ) ) {
+                $width = ( 'full' == $type ) ? $bp->avatar->full->width : $bp->avatar->thumb->width;
+            } else {
+                $width = 20;
+            }
+
         }
-
-        // Backpat
-        if ( !isset( $width ) )
-            $width = 20;
-
-        if ( !isset( $height ) )
-            $height = 20;
 
         // Within the loop, we the current activity should be set first to the

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

@@ -19 +19 @@
         <a href="<?php bp_activity_user_link(); ?>">
 
-            <?php bp_activity_avatar( 'type=thumb' ); ?>
+            <?php bp_activity_avatar(); ?>
 
         </a>