<!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] [3166] branches/1.2/bp-messages.php:
Fixes #2568 props jeffsayre</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3166</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-09 20:33:16 +0000 (Mon, 09 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2568 props jeffsayre</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpmessagesphp">branches/1.2/bp-messages.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpmessagesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-messages.php (3165 => 3166)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-messages.php 2010-08-09 20:26:03 UTC (rev 3165)
+++ branches/1.2/bp-messages.php 2010-08-09 20:33:16 UTC (rev 3166)
</span><span class="lines">@@ -154,17 +154,17 @@
</span><span class="cx"> // Remove any saved message data from a previous session.
</span><span class="cx"> messages_remove_callback_values();
</span><span class="cx">
</span><del>- /* Check if the message form has been submitted */
</del><ins>+ // Check if the message form has been submitted
</ins><span class="cx"> if ( isset( $_POST['send'] ) ) {
</span><span class="cx">
</span><del>- /* Check the nonce */
</del><ins>+ // Check the nonce
</ins><span class="cx"> check_admin_referer( 'messages_send_message' );
</span><span class="cx">
</span><del>- /* Check we have what we need */
</del><ins>+ // Check we have what we need
</ins><span class="cx"> if ( empty( $_POST['subject'] ) || empty( $_POST['content'] ) ) {
</span><span class="cx"> bp_core_add_message( __( 'There was an error sending that message, please try again', 'buddypress' ), 'error' );
</span><span class="cx"> } else {
</span><del>- /* If this is a notice, send it */
</del><ins>+ // If this is a notice, send it
</ins><span class="cx"> if ( isset( $_POST['send-notice'] ) ) {
</span><span class="cx"> if ( messages_send_notice( $_POST['subject'], $_POST['content'] ) ) {
</span><span class="cx"> bp_core_add_message( __( 'Notice sent successfully!', 'buddypress' ) );
</span><span class="lines">@@ -173,12 +173,13 @@
</span><span class="cx"> bp_core_add_message( __( 'There was an error sending that notice, please try again', 'buddypress' ), 'error' );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- /* Filter recipients into the format we need - array( 'username/userid', 'username/userid' ) */
</del><ins>+ // Filter recipients into the format we need - array( 'username/userid', 'username/userid' )
</ins><span class="cx"> $autocomplete_recipients = explode( ',', $_POST['send-to-input'] );
</span><del>- $typed_recipients = explode( ' ', $_POST['send_to_usernames'] );
- $recipients = array_merge( (array) $autocomplete_recipients, (array) $typed_recipients );
</del><ins>+ $typed_recipients = explode( ' ', $_POST['send_to_usernames'] );
+ $recipients = array_merge( (array) $autocomplete_recipients, (array) $typed_recipients );
+ $recipients = apply_filters( 'bp_messages_recipients', $recipients );
</ins><span class="cx">
</span><del>- /* Send the message */
</del><ins>+ // Send the message
</ins><span class="cx"> if ( $thread_id = messages_new_message( array( 'recipients' => $recipients, 'subject' => $_POST['subject'], 'content' => $_POST['content'] ) ) ) {
</span><span class="cx"> bp_core_add_message( __( 'Message sent successfully!', 'buddypress' ) );
</span><span class="cx"> bp_core_redirect( $bp->loggedin_user->domain . $bp->messages->slug . '/view/' . $thread_id . '/' );
</span><span class="lines">@@ -187,7 +188,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> do_action( 'messages_screen_compose' );
</span></span></pre>
</div>
</div>
</body>
</html>