<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [3168] branches/1.2/bp-activity/bp-activity-templatetags.php:
Fixes #2578.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3168</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-09 21:53:49 +0000 (Mon, 09 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2578. (1.3 early bird special)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivitybpactivitytemplatetagsphp">branches/1.2/bp-activity/bp-activity-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity/bp-activity-templatetags.php (3167 => 3168)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity/bp-activity-templatetags.php 2010-08-09 20:47:39 UTC (rev 3167)
+++ branches/1.2/bp-activity/bp-activity-templatetags.php 2010-08-09 21:53:49 UTC (rev 3168)
</span><span class="lines">@@ -394,43 +394,112 @@
</span><span class="cx"> return apply_filters( 'bp_get_activity_user_link', $link );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * bp_activity_avatar( $args )
+ *
+ * Output the avatar of the user that performed the action
+ *
+ * @param array $args
+ */
</ins><span class="cx"> function bp_activity_avatar( $args = '' ) {
</span><span class="cx"> echo bp_get_activity_avatar( $args );
</span><span class="cx"> }
</span><ins>+ /**
+ * bp_get_activity_avatar( $args )
+ *
+ * Return the avatar of the user that performed the action
+ *
+ * @global array $bp
+ * @global object $activities_template
+ * @param array $args optional
+ * @return string
+ */
</ins><span class="cx"> function bp_get_activity_avatar( $args = '' ) {
</span><span class="cx"> global $bp, $activities_template;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'type' => 'thumb',
- 'width' => 20,
</del><ins>+ 'type' => 'thumb',
+ 'width' => 20,
</ins><span class="cx"> 'height' => 20,
</span><del>- 'class' => 'avatar',
- 'alt' => __( 'Avatar', 'buddypress' ),
- 'email' => false
</del><ins>+ 'class' => 'avatar',
+ 'alt' => __( 'Avatar', 'buddypress' ),
+ 'email' => false
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- $item_id = false;
- if ( (int)$activities_template->activity->user_id )
- $item_id = $activities_template->activity->user_id;
- else if ( $activities_template->activity->item_id )
- $item_id = $activities_template->activity->item_id;
</del><ins>+ // Primary activity avatar is always a user, but can be modified via a filter
+ $object = apply_filters( 'bp_get_activity_avatar_object_' . $activities_template->activity->component, 'user' );
+ $item_id = apply_filters( 'bp_get_activity_avatar_item_id', $activities_template->activity->user_id );
</ins><span class="cx">
</span><del>- $object = 'user';
- if ( $bp->groups->id == $activities_template->activity->component && !(int) $activities_template->activity->user_id )
- $object = 'group';
- if ( $bp->blogs->id == $activities_template->activity->component && !(int) $activities_template->activity->user_id )
- $object = 'blog';
</del><ins>+ // If this is a user object pass the users' email address for Gravatar so we don't have to refetch it.
+ if ( 'user' == $object && empty( $email ) )
+ $email = $activities_template->activity->user_email;
</ins><span class="cx">
</span><del>- $object = apply_filters( 'bp_get_activity_avatar_object_' . $activities_template->activity->component, $object );
</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><del>- /* If this is a user object pass the users' email address for Gravatar so we don't have to refetch it. */
- if ( 'user' == $object && empty($email) )
</del><ins>+/**
+ * bp_activity_secondary_avatar( $args )
+ *
+ * Output the avatar of the object that action was performed on
+ *
+ * @param array $args optional
+ */
+function bp_activity_secondary_avatar( $args = '' ) {
+ echo bp_get_activity_secondary_avatar( $args );
+}
+ /**
+ * bp_get_activity_secondary_avatar( $args )
+ *
+ * Return the avatar of the object that action was performed on
+ *
+ * @global array $bp
+ * @global object $activities_template
+ * @param array $args optional
+ * @return string
+ */
+ function bp_get_activity_secondary_avatar( $args = '' ) {
+ global $bp, $activities_template;
+
+ $defaults = array(
+ 'type' => 'thumb',
+ 'width' => 20,
+ 'height' => 20,
+ 'class' => 'avatar',
+ 'alt' => __( 'Avatar', 'buddypress' ),
+ 'email' => false
+ );
+
+ $r = wp_parse_args( $args, $defaults );
+ extract( $r, EXTR_SKIP );
+
+ // Set item_id and object (default to user)
+ switch ( $activities_template->activity->component ) {
+ case $bp->groups->id :
+ $object = 'group';
+ $item_id = $activities_template->activity->item_id;
+ break;
+ case $bp->blogs->id :
+ $object = 'blog';
+ $item_id = $activities_template->activity->item_id;
+ break;
+ default :
+ $object = 'user';
+ $item_id = $activities_template->activity->user_id;
+ break;
+ }
+
+ // Allow object and item_id to be filtered
+ $object = apply_filters( 'bp_get_activity_secondary_avatar_object_' . $activities_template->activity->component, $object );
+ $item_id = apply_filters( 'bp_get_activity_secondary_avatar_item_id', $item_id );
+
+ // Used for any user to user activity
+ if ( 'user' == $object && empty( $email ) )
</ins><span class="cx"> $email = $activities_template->activity->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_secondary_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"> function bp_activity_action() {
</span></span></pre>
</div>
</div>
</body>
</html>