Ticket #3806: 3806.01.patch

bp-activity/bp-activity-loader.php

@@ -308 +308 @@
                         } else {
                                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
                                         'item_id' => bp_displayed_user_id(),
-                                        'type'    => 'thumb'
+                                        'type'    => 'thumb',
+                                        'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), $bp->displayed_user->fullname ),
+                                        'title'  => sprintf( __( 'Profile picture of %s', 'buddypress' ), $bp->displayed_user->fullname )
                                 ) );
                                 $bp->bp_options_title  = $bp->displayed_user->fullname;
                         }

bp-activity/bp-activity-template.php

@@ -898 +898 @@
                 $type_default = bp_is_single_activity() ? 'full' : 'thumb';
 
                 $defaults = array(
-                        'alt'     => __( 'Profile picture of %s', 'buddypress' ),
+                        'alt'     => '',
                         'class'   => 'avatar',
                         'email'   => false,
                         'type'    => $type_default,
@@ -991 +991 @@
                         case 'groups' :
                                 $object = 'group';
                                 $item_id = $activities_template->activity->item_id;
+                                $item = groups_get_group( array( 'group_id' => $item_id ) );
 
                                 if ( empty( $alt ) )
-                                        $alt = __( 'Group logo of %s', 'buddypress' );
+                                        $alt = sprintf( __( 'Group logo of %s', 'buddypress' ), $item->name );
 
                                 break;
                         case 'blogs' :
@@ -1009 +1010 @@
                                 $item_id = $activities_template->activity->secondary_item_id;
 
                                 if ( empty( $alt ) )
-                                        $alt = __( 'Profile picture of %s', 'buddypress' );
+                                        $alt = sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $item_id ) );
 
                                 break;
                         default :
@@ -1018 +1019 @@
                                 $email = $activities_template->activity->user_email;
 
                                 if ( !$alt )
-                                        $alt = __( 'Profile picture of %s', 'buddypress' );
+                                        $alt = sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $item_id ) );
 
                                 break;
                 }

bp-core/bp-core-avatars.php

@@ -146 +146 @@
         // Get item name for alt/title tags
         $item_name = '';
 
+        if ( !$title )
+                $title = $alt;
+
         // Don't do this query if we don't have to
         if ( !$alt || !$title ) {
                 if ( 'user' == $object )
@@ -598 +601 @@
                 return !empty( $avatar ) ? $avatar : $default;
 
         if ( !$alt )
-                $alt = __( 'Avatar of %s', 'buddypress' );
+                $alt = sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $id ) );
 
         // Let BuddyPress handle the fetching of the avatar
         $bp_avatar = bp_core_fetch_avatar( array( 'item_id' => $id, 'width' => $size, 'height' => $size, 'alt' => $alt ) );

bp-core/bp-core-classes.php

@@ -169 +169 @@
                 wp_cache_set( 'bp_user_email_' . $this->id, $this->email, 'bp' );
                 wp_cache_set( 'bp_user_url_' . $this->id, $this->user_url, 'bp' );
 
-                $this->avatar       = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full'  ) );
-                $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb' ) );
-                $this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'width' => 30, 'height' => 30 ) );
+                $this->avatar       = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full', 'alt' => $this->fullname  ) );
+                $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => $this->fullname ) );
+                $this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => $this->fullname ) );
                 $this->last_active  = bp_core_get_last_activity( bp_get_user_meta( $this->id, 'last_activity', true ), __( 'active %s', 'buddypress' ) );
         }
 

bp-forums/bp-forums-template.php

@@ -488 +488 @@
                         'type'   => 'thumb',
                         'width'  => false,
                         'height' => false,
-                        'alt'    => __( 'Profile picture of %s', 'buddypress' )
+                        'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $forum_template->topic->topic_poster ) )
                 );
 
                 $r = wp_parse_args( $args, $defaults );

bp-members/bp-members-template.php

@@ -481 +481 @@
                         'height' => false,
                         'class' => 'avatar',
                         'id' => false,
-                        'alt' => __( 'Profile picture of %s', 'buddypress' )
+                        'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), $members_template->member->display_name ),
+                        'title' => sprintf( __( 'Profile picture of %s', 'buddypress' ), $members_template->member->display_name )
                 );
 
                 $r = wp_parse_args( $args, $defaults );
                 extract( $r, EXTR_SKIP );
 
-                return apply_filters( 'bp_get_member_avatar', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->id, 'type' => $type, 'alt' => $alt, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $members_template->member->user_email ) ) );
+                return apply_filters( 'bp_get_member_avatar', bp_core_fetch_avatar( array( 'item_id' => $members_template->member->id, 'type' => $type, 'alt' => $alt, 'title' => $title, 'css_id' => $id, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $members_template->member->user_email ) ) );
         }
 
 function bp_member_permalink() {
@@ -777 +778 @@
                         'width'  => false,
                         'height' => false,
                         'html'   => true,
-                        'alt'    => __( 'Profile picture of %s', 'buddypress' )
+                        'alt'    => sprintf( __( 'Profile picture of %s', 'buddypress' ), $bp->loggedin_user->fullname ),
+                        'title'  => sprintf( __( 'Profile picture of %s', 'buddypress' ), $bp->loggedin_user->fullname )
                 );
 
                 $r = wp_parse_args( $args, $defaults );
                 extract( $r, EXTR_SKIP );
 
-                return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => bp_loggedin_user_id(), 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt ) ) );
+                return apply_filters( 'bp_get_loggedin_user_avatar', bp_core_fetch_avatar( array( 'item_id' => bp_loggedin_user_id(), 'type' => $type, 'width' => $width, 'height' => $height, 'html' => $html, 'alt' => $alt, 'title' => $title ) ) );
         }
 
 function bp_displayed_user_avatar( $args = '' ) {