<!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] [3171] branches/1.2/bp-themes/bp-default/functions.php:
Hard code component ID'
s to ensure proper display of secondary avatars if component is deactivated
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3171</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-10 00:04:25 +0000 (Tue, 10 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hard code component ID's to ensure proper display of secondary avatars if component is deactivated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpthemesbpdefaultfunctionsphp">branches/1.2/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/functions.php (3170 => 3171)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/functions.php 2010-08-09 23:07:56 UTC (rev 3170)
+++ branches/1.2/bp-themes/bp-default/functions.php 2010-08-10 00:04:25 UTC (rev 3171)
</span><span class="lines">@@ -140,15 +140,17 @@
</span><span class="cx"> add_filter( 'the_posts', 'bp_dtheme_fix_the_posts_on_activity_front' );
</span><span class="cx">
</span><span class="cx"> function bp_dtheme_activity_secondary_avatars( $action, $activity ) {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> switch ( $activity->component ) {
</span><del>- case $bp->groups->id :
- case $bp->blogs->id :
- case $bp->friends->id :
- $reverse_content = strrev( $action );
- $position = strpos( $reverse_content, 'a<' );
- $action = substr_replace( $action, bp_get_activity_secondary_avatar(), -$position - 2, 0 );
</del><ins>+ case 'groups' :
+ case 'blogs' :
+ case 'friends' :
+ // Only insert avatar if one exists
+ if ( $secondary_avatar = bp_get_activity_secondary_avatar() ) {
+ $reverse_content = strrev( $action );
+ $position = strpos( $reverse_content, 'a<' );
+ $action = substr_replace( $action, $secondary_avatar, -$position - 2, 0 );
+ }
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>