<!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][6340] trunk/bp-messages/bp-messages-functions.php: Fix messages_new_message() so numeric usernames get parsed properly.</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><a href="http://buddypress.trac.wordpress.org/changeset/6340">6340</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2012-09-17 05:36:46 +0000 (Mon, 17 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix messages_new_message() so numeric usernames get parsed properly.
Previously to this commit, numeric recipients were being checked
against the user ID column with bp_core_get_core_userdata() only.
This was considered okay since you cannot create a username with only
numbers on the BP frontend registration page. However, you can create
numeric usernames in the WP backend or if the site already uses
numeric usernames via LDAP or some other login system.
So, this commit also checks against user_login / user_nicename with
bp_core_get_userid() / bp_core_get_userid_from_nicename() as well to
be considerate to those use cases.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4305">#4305</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagesfunctionsphp">trunk/bp-messages/bp-messages-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-functions.php (6339 => 6340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-functions.php 2012-09-16 16:36:27 UTC (rev 6339)
+++ trunk/bp-messages/bp-messages-functions.php 2012-09-17 05:36:46 UTC (rev 6340)
</span><span class="lines">@@ -68,13 +68,26 @@
</span><span class="cx"> // Loop the recipients and convert all usernames to user_ids where needed
</span><span class="cx"> foreach( (array) $recipients as $recipient ) {
</span><span class="cx"> $recipient = trim( $recipient );
</span><ins>+
</ins><span class="cx"> if ( empty( $recipient ) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ $recipient_id = false;
+
+ // input was numeric
</ins><span class="cx"> if ( is_numeric( $recipient ) ) {
</span><ins>+ // do a check against the user ID column first
</ins><span class="cx"> if ( bp_core_get_core_userdata( (int) $recipient ) )
</span><span class="cx"> $recipient_id = (int) $recipient;
</span><span class="cx">
</span><ins>+ // if that fails, check against the user_login / user_nicename column
+ else {
+ if ( bp_is_username_compatibility_mode() )
+ $recipient_id = bp_core_get_userid( (int) $recipient );
+ else
+ $recipient_id = bp_core_get_userid_from_nicename( (int) $recipient );
+ }
+
</ins><span class="cx"> } else {
</span><span class="cx"> if ( bp_is_username_compatibility_mode() )
</span><span class="cx"> $recipient_id = bp_core_get_userid( $recipient );
</span></span></pre>
</div>
</div>
</body>
</html>