<!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] [2020] trunk:
Typecasting message arrays and checking to make sure duplicates do not slip through
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2020</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-30 18:53:29 +0000 (Wed, 30 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Typecasting message arrays and checking to make sure duplicates do not slip through.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagesclassesphp">trunk/bp-messages/bp-messages-classes.php</a></li>
<li><a href="#trunkbpmessagesphp">trunk/bp-messages.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-classes.php (2019 => 2020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-classes.php 2009-09-30 18:43:03 UTC (rev 2019)
+++ trunk/bp-messages/bp-messages-classes.php 2009-09-30 18:53:29 UTC (rev 2020)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> $recipient_links[] = bp_core_get_userlink( $recipients[$i] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return implode( ', ', $recipient_links);
</del><ins>+ return implode( ', ', (array) $recipient_links );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_recipients} ( user_id, thread_id, unread_count ) VALUES ( %d, %d, 1 )", $this->recipients[$i], $this->thread_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !in_array( $this->sender_id, $this->recipients ) ) {
</del><ins>+ if ( !in_array( $this->sender_id, (array)$this->recipients ) ) {
</ins><span class="cx"> // Finally, add a recipient entry for the sender, as replies need to go to this person too.
</span><span class="cx"> $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_recipients} ( user_id, thread_id, unread_count, sender_only ) VALUES ( %d, %d, 0, 0 )", $this->sender_id, $this->thread_id ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmessagesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages.php (2019 => 2020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages.php 2009-09-30 18:43:03 UTC (rev 2019)
+++ trunk/bp-messages.php 2009-09-30 18:53:29 UTC (rev 2020)
</span><span class="lines">@@ -439,9 +439,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Strip the sender from the recipient list if they exist */
</span><del>- if ( $key = array_search( $sender_id, $recipient_ids ) )
- unset( $recipient_ids[$key] );
</del><ins>+ if ( $key = array_search( $sender_id, (array)$recipient_ids ) )
+ unset( $recipient_ids[$key] );
</ins><span class="cx">
</span><ins>+ /* Remove duplicates */
+ $recipient_ids = array_unique( (array)$recipient_ids );
+
+ if ( empty( $recipient_ids ) )
+ return false;
+
</ins><span class="cx"> $message->recipients = $recipient_ids;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -449,7 +455,7 @@
</span><span class="cx"> require_once( BP_PLUGIN_DIR . '/bp-messages/bp-messages-notifications.php' );
</span><span class="cx">
</span><span class="cx"> // Send screen notifications to the recipients
</span><del>- foreach ( $message->recipients as $recipient ) {
</del><ins>+ foreach ( (array)$message->recipients as $recipient ) {
</ins><span class="cx"> bp_core_add_notification( $message->id, $recipient, 'messages', 'new_message' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>