<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][5477] trunk/bp-activity: Pass concatenated alt parameter to bp_core_fetch_avatar() throughout activity component.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/5477">5477</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-12-10 17:41:37 +0000 (Sat, 10 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pass concatenated alt parameter to bp_core_fetch_avatar() throughout activity component. References <a href="http://buddypress.trac.wordpress.org/ticket/3806">#3806</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityloaderphp">trunk/bp-activity/bp-activity-loader.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-loader.php (5476 => 5477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-loader.php 2011-12-10 14:30:53 UTC (rev 5476)
+++ trunk/bp-activity/bp-activity-loader.php 2011-12-10 17:41:37 UTC (rev 5477)
</span><span class="lines">@@ -307,7 +307,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> $bp->bp_options_avatar = bp_core_fetch_avatar( array(
</span><span class="cx"> 'item_id' => bp_displayed_user_id(),
</span><del>- 'type' => 'thumb'
</del><ins>+ 'type' => 'thumb',
+ 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_displayed_user_fullname() )
</ins><span class="cx"> ) );
</span><span class="cx"> $bp->bp_options_title = $bp->displayed_user->fullname;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (5476 => 5477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-12-10 14:30:53 UTC (rev 5476)
+++ trunk/bp-activity/bp-activity-template.php 2011-12-10 17:41:37 UTC (rev 5477)
</span><span class="lines">@@ -898,7 +898,7 @@
</span><span class="cx"> $type_default = bp_is_single_activity() ? 'full' : 'thumb';
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'alt' => __( 'Profile picture of %s', 'buddypress' ),
</del><ins>+ 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), $activities_template->activity->display_name ),
</ins><span class="cx"> 'class' => 'avatar',
</span><span class="cx"> 'email' => false,
</span><span class="cx"> 'type' => $type_default,
</span><span class="lines">@@ -989,36 +989,45 @@
</span><span class="cx"> // Set item_id and object (default to user)
</span><span class="cx"> switch ( $activities_template->activity->component ) {
</span><span class="cx"> case 'groups' :
</span><del>- $object = 'group';
</del><ins>+ $object = 'group';
</ins><span class="cx"> $item_id = $activities_template->activity->item_id;
</span><ins>+
+ 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' );
+ }
+ }
</ins><span class="cx">
</span><del>- if ( empty( $alt ) )
- $alt = __( 'Group logo of %s', 'buddypress' );
-
</del><span class="cx"> break;
</span><span class="cx"> case 'blogs' :
</span><del>- $object = 'blog';
</del><ins>+ $object = 'blog';
</ins><span class="cx"> $item_id = $activities_template->activity->item_id;
</span><span class="cx">
</span><del>- if ( !$alt )
- $alt = sprintf( __( 'Site authored by %s', 'buddypress' ), get_blog_option( $item_id, 'blogname' ) );
</del><ins>+ if ( !$alt ) {
+ $alt = sprintf( __( 'Profile picture of the author of the site %s', 'buddypress' ), get_blog_option( $item_id, 'blogname' ) );
+ }
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> case 'friends' :
</span><span class="cx"> $object = 'user';
</span><span class="cx"> $item_id = $activities_template->activity->secondary_item_id;
</span><span class="cx">
</span><del>- if ( empty( $alt ) )
- $alt = __( 'Profile picture of %s', 'buddypress' );
</del><ins>+ if ( empty( $alt ) ) {
+ $alt = sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_core_get_user_displayname( $activities_template->activity->secondary_item_id ) );
+ }
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> default :
</span><span class="cx"> $object = 'user';
</span><span class="cx"> $item_id = $activities_template->activity->user_id;
</span><del>- $email = $activities_template->activity->user_email;
</del><ins>+ $email = $activities_template->activity->user_email;
</ins><span class="cx">
</span><del>- if ( !$alt )
- $alt = __( 'Profile picture of %s', 'buddypress' );
</del><ins>+ if ( !$alt ) {
+ $alt = sprintf( __( 'Profile picture of %s', 'buddypress' ), $activities_template->activity->display_name );
+ }
</ins><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>