<!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][6684] trunk/bp-activity/bp-activity-template.php: Fix bug in bp_get_activity_avatar() causing incorrect alternate avatar text in activity stream comments.</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/6684">6684</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-12-28 05:21:31 +0000 (Fri, 28 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix bug in bp_get_activity_avatar() causing incorrect alternate avatar text in activity stream comments.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (6683 => 6684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2012-12-28 05:20:45 UTC (rev 6683)
+++ trunk/bp-activity/bp-activity-template.php 2012-12-28 05:21:31 UTC (rev 6684)
</span><span class="lines">@@ -957,19 +957,23 @@
</span><span class="cx"> * @return string User avatar
</span><span class="cx"> */
</span><span class="cx"> function bp_get_activity_avatar( $args = '' ) {
</span><del>- global $activities_template, $bp;
</del><ins>+ global $activities_template;
</ins><span class="cx">
</span><ins>+ $bp = buddypress();
+
</ins><span class="cx"> // On activity permalink pages, default to the full-size avatar
</span><span class="cx"> $type_default = bp_is_single_activity() ? 'full' : 'thumb';
</span><span class="cx">
</span><del>- if ( !empty( $activities_template->activity->display_name ) ) {
- $dn_default = $activities_template->activity->display_name;
- } else if ( !empty( $activities_template->current_comment->display_name ) ) {
- $dn_default = $activities_template->current_comment->display_name;
- }
</del><ins>+ // Within the activity comment loop, the current activity should be set
+ // to current_comment. Otherwise, just use activity.
+ $current_activity_item = isset( $activities_template->activity->current_comment ) ? $activities_template->activity->current_comment : $activities_template->activity;
</ins><span class="cx">
</span><del>- $alt_default = isset( $dn_default ) ? sprintf( __( 'Profile picture of %s', 'buddypress' ), $activities_template->activity->display_name ) : __( 'Profile picture', 'buddypress' );
</del><ins>+ // Activity user display name
+ $dn_default = isset( $current_activity_item->display_name ) ? $current_activity_item->display_name : '';
</ins><span class="cx">
</span><ins>+ // Prepend some descriptive text to alt
+ $alt_default = !empty( $dn_default ) ? sprintf( __( 'Profile picture of %s', 'buddypress' ), $dn_default ) : __( 'Profile picture', 'buddypress' );
+
</ins><span class="cx"> $defaults = array(
</span><span class="cx"> 'alt' => $alt_default,
</span><span class="cx"> 'class' => 'avatar',
</span><span class="lines">@@ -982,6 +986,7 @@
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> if ( !isset( $height ) && !isset( $width ) ) {
</span><ins>+
</ins><span class="cx"> // Backpat
</span><span class="cx"> if ( isset( $bp->avatar->full->height ) || isset( $bp->avatar->thumb->height ) ) {
</span><span class="cx"> $height = ( 'full' == $type ) ? $bp->avatar->full->height : $bp->avatar->thumb->height;
</span><span class="lines">@@ -995,23 +1000,27 @@
</span><span class="cx"> } else {
</span><span class="cx"> $width = 20;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><del>- // Within the loop, we the current activity should be set first to the
- // current_comment, if available
- $current_activity_item = isset( $activities_template->activity->current_comment ) ? $activities_template->activity->current_comment : $activities_template->activity;
-
</del><span class="cx"> // Primary activity avatar is always a user, but can be modified via a filter
</span><span class="cx"> $object = apply_filters( 'bp_get_activity_avatar_object_' . $current_activity_item->component, 'user' );
</span><del>- $item_id = $user_id ? $user_id : $current_activity_item->user_id;
</del><ins>+ $item_id = !empty( $user_id ) ? $user_id : $current_activity_item->user_id;
</ins><span class="cx"> $item_id = apply_filters( 'bp_get_activity_avatar_item_id', $item_id );
</span><span class="cx">
</span><span class="cx"> // If this is a user object pass the users' email address for Gravatar so we don't have to refetch it.
</span><del>- if ( 'user' == $object && empty( $user_id ) && empty( $email ) && isset( $activities_template->activity->user_email ) )
</del><ins>+ if ( 'user' == $object && empty( $user_id ) && empty( $email ) && isset( $current_activity_item->user_email ) )
</ins><span class="cx"> $email = $current_activity_item->user_email;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_activity_avatar', bp_core_fetch_avatar( array( 'item_id' => $item_id, 'object' => $object, 'type' => $type, 'alt' => $alt, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $email ) ) );
</del><ins>+ return apply_filters( 'bp_get_activity_avatar', bp_core_fetch_avatar( array(
+ 'item_id' => $item_id,
+ 'object' => $object,
+ 'type' => $type,
+ 'alt' => $alt,
+ 'class' => $class,
+ 'width' => $width,
+ 'height' => $height,
+ 'email' => $email
+ ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>