<!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][8724] trunk/src/bp-activity/bp-activity-template.php: Add sanity checks to `bp_activity_comments_user_avatars()` so empty user-data does not generate list items.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/8724">8724</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-07-29 19:41:40 +0000 (Tue, 29 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add sanity checks to `bp_activity_comments_user_avatars()` so empty user-data does not generate list items.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivitytemplatephp">trunk/src/bp-activity/bp-activity-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-activity/bp-activity-template.php (8723 => 8724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-activity/bp-activity-template.php 2014-07-29 19:22:50 UTC (rev 8723)
+++ trunk/src/bp-activity/bp-activity-template.php 2014-07-29 19:41:40 UTC (rev 8724)
</span><span class="lines">@@ -3074,28 +3074,52 @@
</span><span class="cx"> * @param array $args See {@link bp_core_fetch_avatar()}.
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_comments_user_avatars( $args = array() ) {
</span><del>- $defaults = array(
</del><ins>+
+ $r = bp_parse_args( $args, array(
</ins><span class="cx"> 'height' => false,
</span><span class="cx"> 'html' => true,
</span><span class="cx"> 'type' => 'thumb',
</span><span class="cx"> 'width' => false,
</span><del>- );
</del><ins>+ ) );
</ins><span class="cx">
</span><del>- $args = wp_parse_args( $args, $defaults );
- extract( $args, EXTR_SKIP );
-
</del><span class="cx"> // Get the user IDs of everyone who has left a comment to the current activity item
</span><span class="cx"> $user_ids = bp_activity_get_comments_user_ids();
</span><ins>+ $output = array();
+ $retval = '';
</ins><span class="cx">
</span><del>- $output = array();
- foreach ( (array) $user_ids as $user_id ) {
- $profile_link = bp_core_get_user_domain( $user_id );
- $image_html = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'height' => $height, 'html' => $html, 'type' => $type, 'width' => $width, ) );
</del><ins>+ if ( ! empty( $user_ids ) ) {
+ foreach ( (array) $user_ids as $user_id ) {
</ins><span class="cx">
</span><del>- $output[] = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $profile_link ), $image_html );
</del><ins>+ // Skip an empty user ID
+ if ( empty( $user_id ) ) {
+ continue;
+ }
+
+ // Get profile link for this user
+ $profile_link = bp_core_get_user_domain( $user_id );
+
+ // Get avatar for this user
+ $image_html = bp_core_fetch_avatar( array(
+ 'item_id' => $user_id,
+ 'height' => $r['height'],
+ 'html' => $r['html'],
+ 'type' => $r['type'],
+ 'width' => $r['width']
+ ) );
+
+ // If user has link & avatar, add them to the output array
+ if ( ! empty( $profile_link ) && ! empty( $image_html ) ) {
+ $output[] = sprintf( '<a href="%1$s">%2$s</a>', esc_url( $profile_link ), $image_html );
+ }
+ }
+
+ // If output array is not empty, wrap everything in some list items
+ if ( ! empty( $output ) ) {
+ $retval = '<li>' . implode( '</li><li>', $output ) . '</li>';
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- echo apply_filters( 'bp_activity_comments_user_avatars', '<li>' . implode( '</li><li>', $output ) . '</li>', $args, $output );
</del><ins>+ echo apply_filters( 'bp_activity_comments_user_avatars', $retval, $args, $output );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>