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

Timestamp:

12/10/2011 05:41:37 PM (14 years ago)

Author:

boonebgorges

Message:

Pass concatenated alt parameter to bp_core_fetch_avatar() throughout activity component. References #3806

File:

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

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

@@ -899 +899 @@
 
         $defaults = array(
-            'alt'     => __( 'Profile picture of %s', 'buddypress' ),
+            'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), $activities_template->activity->display_name ),
             'class'   => 'avatar',
             'email'   => false,
@@ -990 +990 @@
         switch ( $activities_template->activity->component ) {
             case 'groups' :
-                $object = 'group';
+                $object  = 'group';
                 $item_id = $activities_template->activity->item_id;
-
-                if ( empty( $alt ) )
-                    $alt = __( 'Group logo of %s', 'buddypress' );
+                
+                if ( empty( $alt ) ) {
+                    $group = groups_get_group( $item_id );
+                    if ( isset( $group->name ) ) {
+                        $alt = sprintf( __( 'Group logo of %s', 'buddypress' ), $group->name );
+                    } else {
+                        $alt = __( 'Group logo', 'buddypress' );
+                    }
+                }
 
                 break;
             case 'blogs' :
-                $object = 'blog';
+                $object  = 'blog';
                 $item_id = $activities_template->activity->item_id;
 
-                if ( !$alt )
-                    $alt = sprintf( __( 'Site authored by %s', 'buddypress' ), get_blog_option( $item_id, 'blogname' ) );
+                if ( !$alt ) {
+                    $alt = sprintf( __( 'Profile picture of the author of the site %s', 'buddypress' ), get_blog_option( $item_id, 'blogname' ) );
+                }
 
                 break;
@@ -1009 +1016 @@
                 $item_id = $activities_template->activity->secondary_item_id;
 
-                if ( empty( $alt ) )
-                    $alt = __( 'Profile picture of %s', 'buddypress' );
+                if ( empty( $alt ) ) {
+                    $alt = sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $activities_template->activity->secondary_item_id ) );
+                }
 
                 break;
@@ -1016 +1024 @@
                 $object  = 'user';
                 $item_id = $activities_template->activity->user_id;
-                $email = $activities_template->activity->user_email;
-
-                if ( !$alt )
-                    $alt = __( 'Profile picture of %s', 'buddypress' );
+                $email   = $activities_template->activity->user_email;
+
+                if ( !$alt ) {
+                    $alt = sprintf( __( 'Profile picture of %s', 'buddypress' ), $activities_template->activity->display_name );
+                }
 
                 break;