<!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][3584] trunk: Fix PHP notices in messages component</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>3584</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-25 19:13:22 +0000 (Sat, 25 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix PHP notices in messages component</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagestemplatetagsphp">trunk/bp-messages/bp-messages-templatetags.php</a></li>
<li><a href="#trunkbpmessagesphp">trunk/bp-messages.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagestemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-templatetags.php (3583 => 3584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-templatetags.php 2010-12-25 18:01:57 UTC (rev 3583)
+++ trunk/bp-messages/bp-messages-templatetags.php 2010-12-25 19:13:22 UTC (rev 3584)
</span><span class="lines">@@ -360,14 +360,22 @@
</span><span class="cx"> echo bp_get_messages_subject_value();
</span><span class="cx"> }
</span><span class="cx"> function bp_get_messages_subject_value() {
</span><del>- return apply_filters( 'bp_get_messages_subject_value', $_POST['subject'] );
</del><ins>+ $subject = '';
+ if ( !empty( $_POST['subject'] ) )
+ $subject = $_POST['subject'];
+
+ return apply_filters( 'bp_get_messages_subject_value', $subject );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_messages_content_value() {
</span><span class="cx"> echo bp_get_messages_content_value();
</span><span class="cx"> }
</span><span class="cx"> function bp_get_messages_content_value() {
</span><del>- return apply_filters( 'bp_get_messages_content_value', $_POST['content'] );
</del><ins>+ $content = '';
+ if ( !empty( $_POST['content'] ) )
+ $content = $_POST['content'];
+
+ return apply_filters( 'bp_get_messages_content_value', $content );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_messages_options() {
</span><span class="lines">@@ -577,7 +585,11 @@
</span><span class="cx"> echo bp_get_message_get_recipient_usernames();
</span><span class="cx"> }
</span><span class="cx"> function bp_get_message_get_recipient_usernames() {
</span><del>- return apply_filters( 'bp_get_message_get_recipient_usernames', $_GET['r'] );
</del><ins>+ $recipients = '';
+ if ( !empty( $_GET['r'] ) )
+ $recipients = $_GET['r'];
+
+ return apply_filters( 'bp_get_message_get_recipient_usernames', $recipients );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmessagesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages.php (3583 => 3584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages.php 2010-12-25 18:01:57 UTC (rev 3583)
+++ trunk/bp-messages.php 2010-12-25 19:13:22 UTC (rev 3584)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> function messages_action_delete_message() {
</span><span class="cx"> global $bp, $thread_id;
</span><span class="cx">
</span><del>- if ( $bp->current_component != $bp->messages->slug || 'notices' == $bp->current_action || $bp->action_variables[0] != 'delete' )
</del><ins>+ if ( $bp->current_component != $bp->messages->slug || 'notices' == $bp->current_action || empty( $bp->action_variables[0] ) || 'delete' != $bp->action_variables[0] )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $thread_id = $bp->action_variables[1];
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> function messages_action_bulk_delete() {
</span><span class="cx"> global $bp, $thread_ids;
</span><span class="cx">
</span><del>- if ( $bp->current_component != $bp->messages->slug || $bp->action_variables[0] != 'bulk-delete' )
</del><ins>+ if ( $bp->current_component != $bp->messages->slug || empty( $bp->action_variables[0] ) || 'bulk-delete' != $bp->action_variables[0] )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $thread_ids = $_POST['thread_ids'];
</span></span></pre>
</div>
</div>
</body>
</html>