<!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][3867] trunk/bp-activity/bp-activity-template.php: More pass-by-ref fixes.</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>3867</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-24 05:29:31 +0000 (Mon, 24 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>More pass-by-ref fixes. Also prevents debug notices on activity stream comments when certain values are not passed or do not exist within that context.</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 (3866 => 3867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-01-24 05:07:54 UTC (rev 3866)
+++ trunk/bp-activity/bp-activity-template.php 2011-01-24 05:29:31 UTC (rev 3867)
</span><span class="lines">@@ -643,12 +643,12 @@
</span><span class="cx"> global $activities_template;
</span><span class="cx">
</span><span class="cx"> $action = $activities_template->activity->action;
</span><del>- $action = apply_filters( 'bp_get_activity_action_pre_meta', $action, &$activities_template->activity );
</del><ins>+ $action = apply_filters( 'bp_get_activity_action_pre_meta', $action, $activities_template->activity );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $action ) )
</span><span class="cx"> $action = bp_insert_activity_meta( $action );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_activity_action', $action, &$activities_template->activity );
</del><ins>+ return apply_filters( 'bp_get_activity_action', $action, $activities_template->activity );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_activity_content_body() {
</span><span class="lines">@@ -661,7 +661,7 @@
</span><span class="cx"> if ( empty( $activities_template->activity->action ) && !empty( $activities_template->activity->content ) )
</span><span class="cx"> $activities_template->activity->content = bp_insert_activity_meta( $activities_template->activity->content );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_get_activity_content_body', $activities_template->activity->content, &$activities_template->activity );
</del><ins>+ return apply_filters( 'bp_get_activity_content_body', $activities_template->activity->content, $activities_template->activity );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_activity_has_content() {
</span><span class="lines">@@ -697,11 +697,11 @@
</span><span class="cx"> $content = str_replace( '<span class="time-since">%s</span>', '', $content );
</span><span class="cx">
</span><span class="cx"> // Insert the time since.
</span><del>- $content .= ' ' . apply_filters( 'bp_activity_time_since', '<span class="time-since">' . sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', &$activities_template->activity );
</del><ins>+ $content .= ' ' . apply_filters( 'bp_activity_time_since', '<span class="time-since">' . sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', $activities_template->activity );
</ins><span class="cx">
</span><span class="cx"> // Insert the permalink
</span><span class="cx"> if ( !bp_is_single_activity() )
</span><del>- $content .= apply_filters( 'bp_activity_permalink', ' &middot; <a href="' . bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '" class="view" title="' . __( 'View Thread / Permalink', 'buddypress' ) . '">' . __( 'View', 'buddypress' ) . '</a>', &$activities_template->activity );
</del><ins>+ $content .= apply_filters( 'bp_activity_permalink', ' &middot; <a href="' . bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '" class="view" title="' . __( 'View Thread / Permalink', 'buddypress' ) . '">' . __( 'View', 'buddypress' ) . '</a>', $activities_template->activity );
</ins><span class="cx">
</span><span class="cx"> // Add the delete link if the user has permission on this item
</span><span class="cx"> if ( bp_activity_user_can_delete() )
</span><span class="lines">@@ -793,14 +793,41 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $content = '<ul>';
</span><del>- foreach ( (array)$comment->children as $comment ) {
- if ( !$comment->user_fullname )
- $comment->user_fullname = $comment->display_name;
</del><ins>+ foreach ( (array)$comment->children as $comment_child ) {
+ if ( empty( $comment_child->user_fullname ) )
+ $comment_child->user_fullname = $comment_child->display_name;
</ins><span class="cx">
</span><del>- $content .= '<li id="acomment-' . $comment->id . '">';
- $content .= '<div class="acomment-avatar"><a href="' . bp_core_get_user_domain( $comment->user_id, $comment->user_nicename, $comment->user_login ) . '">' . bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'width' => 30, 'height' => 30, 'email' => $comment->user_email ) ) . '</a></div>';
- $content .= '<div class="acomment-meta"><a href="' . bp_core_get_user_domain( $comment->user_id, $comment->user_nicename, $comment->user_login ) . '">' . apply_filters( 'bp_acomment_name', $comment->user_fullname, $comment ) . '</a> &middot; ' . sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( $comment->date_recorded ) );
</del><ins>+ if ( empty( $comment_child->user_nicename ) )
+ $comment_child->user_nicename = '';
</ins><span class="cx">
</span><ins>+ if ( empty( $comment_child->user_login ) )
+ $comment_child->user_login = '';
+
+ if ( empty( $comment_child->user_email ) )
+ $comment_child->user_email = '';
+
+ $content .= '<li id="acomment-' . $comment_child->id . '">';
+ $content .= '<div class="acomment-avatar"><a href="' .
+ bp_core_get_user_domain(
+ $comment_child->user_id,
+ $comment_child->user_nicename,
+ $comment_child->user_login ) . '">' .
+ bp_core_fetch_avatar( array(
+ 'item_id' => $comment_child->user_id,
+ 'width' => 30,
+ 'height' => 30,
+ 'email' => $comment_child->user_email
+ ) ) .
+ '</a></div>';
+
+ $content .= '<div class="acomment-meta"><a href="' .
+ bp_core_get_user_domain(
+ $comment_child->user_id,
+ $comment_child->user_nicename,
+ $comment_child->user_login ) . '">' .
+ apply_filters( 'bp_acomment_name', $comment_child->user_fullname, $comment_child ) .
+ '</a> &middot; ' . sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( $comment_child->date_recorded ) );
+
</ins><span class="cx"> // Reply link - the span is so that threaded reply links can be
</span><span class="cx"> // hidden when JS is off.
</span><span class="cx"> if ( is_user_logged_in() && bp_activity_can_comment_reply( $comment ) )
</span></span></pre>
</div>
</div>
</body>
</html>