<!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][3892] trunk: More pass-by-ref fixes in activity, messages, blogs, and friends components</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>3892</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-24 10:42:48 +0000 (Mon, 24 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>More pass-by-ref fixes in activity, messages, blogs, and friends components</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpblogsbpblogsclassesphp">trunk/bp-blogs/bp-blogs-classes.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsloaderphp">trunk/bp-friends/bp-friends-loader.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesfunctionsphp">trunk/bp-messages/bp-messages-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (3891 => 3892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2011-01-24 10:39:23 UTC (rev 3891)
+++ trunk/bp-activity/bp-activity-classes.php 2011-01-24 10:42:48 UTC (rev 3892)
</span><span class="lines">@@ -49,19 +49,19 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_activity_before_save', &$this );
</span><span class="cx">
</span><del>- $this->id = apply_filters( 'bp_activity_id_before_save', $this->id, &$this );
- $this->item_id = apply_filters( 'bp_activity_item_id_before_save', $this->item_id, &$this );
- $this->secondary_item_id = apply_filters( 'bp_activity_secondary_item_id_before_save', $this->secondary_item_id, &$this );
- $this->user_id = apply_filters( 'bp_activity_user_id_before_save', $this->user_id, &$this );
- $this->primary_link = apply_filters( 'bp_activity_primary_link_before_save', $this->primary_link, &$this );
- $this->component = apply_filters( 'bp_activity_component_before_save', $this->component, &$this );
- $this->type = apply_filters( 'bp_activity_type_before_save', $this->type, &$this );
- $this->action = apply_filters( 'bp_activity_action_before_save', $this->action, &$this );
- $this->content = apply_filters( 'bp_activity_content_before_save', $this->content, &$this );
- $this->date_recorded = apply_filters( 'bp_activity_date_recorded_before_save', $this->date_recorded, &$this );
- $this->hide_sitewide = apply_filters( 'bp_activity_hide_sitewide_before_save', $this->hide_sitewide, &$this );
- $this->mptt_left = apply_filters( 'bp_activity_mptt_left_before_save', $this->mptt_left, &$this );
- $this->mptt_right = apply_filters( 'bp_activity_mptt_right_before_save', $this->mptt_right, &$this );
</del><ins>+ $this->id = apply_filters( 'bp_activity_id_before_save', $this->id, $this );
+ $this->item_id = apply_filters( 'bp_activity_item_id_before_save', $this->item_id, $this );
+ $this->secondary_item_id = apply_filters( 'bp_activity_secondary_item_id_before_save', $this->secondary_item_id, $this );
+ $this->user_id = apply_filters( 'bp_activity_user_id_before_save', $this->user_id, $this );
+ $this->primary_link = apply_filters( 'bp_activity_primary_link_before_save', $this->primary_link, $this );
+ $this->component = apply_filters( 'bp_activity_component_before_save', $this->component, $this );
+ $this->type = apply_filters( 'bp_activity_type_before_save', $this->type, $this );
+ $this->action = apply_filters( 'bp_activity_action_before_save', $this->action, $this );
+ $this->content = apply_filters( 'bp_activity_content_before_save', $this->content, $this );
+ $this->date_recorded = apply_filters( 'bp_activity_date_recorded_before_save', $this->date_recorded, $this );
+ $this->hide_sitewide = apply_filters( 'bp_activity_hide_sitewide_before_save', $this->hide_sitewide, $this );
+ $this->mptt_left = apply_filters( 'bp_activity_mptt_left_before_save', $this->mptt_left, $this );
+ $this->mptt_right = apply_filters( 'bp_activity_mptt_right_before_save', $this->mptt_right, $this );
</ins><span class="cx">
</span><span class="cx"> if ( !$this->component || !$this->type )
</span><span class="cx"> return false;
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> if ( empty( $this->id ) )
</span><span class="cx"> $this->id = $wpdb->insert_id;
</span><span class="cx">
</span><del>- do_action( 'bp_activity_after_save', &$this );
</del><ins>+ do_action( 'bp_activity_after_save', $this );
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $activities && $display_comments )
</span><del>- $activities = BP_Activity_Activity::append_comments( &$activities );
</del><ins>+ $activities = BP_Activity_Activity::append_comments( $activities );
</ins><span class="cx">
</span><span class="cx"> // If $max is set, only return up to the max results
</span><span class="cx"> if ( !empty( $max ) ) {
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (3891 => 3892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2011-01-24 10:39:23 UTC (rev 3891)
+++ trunk/bp-activity/bp-activity-functions.php 2011-01-24 10:42:48 UTC (rev 3892)
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> } else
</span><span class="cx"> $activity = BP_Activity_Activity::get( $max, $page, $per_page, $sort, $search_terms, $filter, $display_comments, $show_hidden, $exclude, $in );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_activity_get', $activity, &$r );
</del><ins>+ return apply_filters( 'bp_activity_get', $activity, $r );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_activity_get_specific( $args = '' ) {
</span></span></pre></div>
<a id="trunkbpblogsbpblogsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-classes.php (3891 => 3892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-classes.php 2011-01-24 10:39:23 UTC (rev 3891)
+++ trunk/bp-blogs/bp-blogs-classes.php 2011-01-24 10:42:48 UTC (rev 3892)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $blog_ids = $wpdb->escape( join( ',', (array)$blog_ids ) );
</span><del>- $paged_blogs = BP_Blogs_Blog::get_blog_extras( &$paged_blogs, $blog_ids, $type );
</del><ins>+ $paged_blogs = BP_Blogs_Blog::get_blog_extras( $paged_blogs, $blog_ids, $type );
</ins><span class="cx">
</span><span class="cx"> return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
</span><span class="cx"> }
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_blog_extras( $paged_blogs, $blog_ids, $type = false ) {
</del><ins>+ function get_blog_extras( &$paged_blogs, &$blog_ids, $type = false ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( empty( $blog_ids ) )
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-loader.php (3891 => 3892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-loader.php 2011-01-24 10:39:23 UTC (rev 3891)
+++ trunk/bp-friends/bp-friends-loader.php 2011-01-24 10:42:48 UTC (rev 3892)
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> // Remove the friend request notice
</span><span class="cx"> bp_users_delete_notifications_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
</span><span class="cx">
</span><del>- do_action( 'friends_friendship_rejected', $friendship_id, &$friendship );
</del><ins>+ do_action( 'friends_friendship_rejected', $friendship_id, $friendship );
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-functions.php (3891 => 3892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-functions.php 2011-01-24 10:39:23 UTC (rev 3891)
+++ trunk/bp-messages/bp-messages-functions.php 2011-01-24 10:42:48 UTC (rev 3892)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> // Send email notifications to the recipients
</span><span class="cx"> messages_notification_new_message( array( 'message_id' => $message->id, 'sender_id' => $message->sender_id, 'subject' => $message->subject, 'content' => $message->message, 'recipients' => $message->recipients, 'thread_id' => $message->thread_id) );
</span><span class="cx">
</span><del>- do_action( 'messages_message_sent', &$message );
</del><ins>+ do_action( 'messages_message_sent', $message );
</ins><span class="cx">
</span><span class="cx"> return $message->thread_id;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>