<!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] [2856] branches/1.2:
Fixes issues with displaying profiles when the user_username and user_nicename are different values
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2856</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-03-19 09:51:12 +0000 (Fri, 19 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes issues with displaying profiles when the user_username and user_nicename are different values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcorecatchuriphp">branches/1.2/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-catchuri.php (2855 => 2856)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-catchuri.php 2010-03-19 09:45:11 UTC (rev 2855)
+++ branches/1.2/bp-core/bp-core-catchuri.php 2010-03-19 09:51:12 UTC (rev 2856)
</span><span class="lines">@@ -103,7 +103,10 @@
</span><span class="cx"> if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) ) {
</span><span class="cx"> if ( ( $bp_uri[0] == BP_MEMBERS_SLUG && !empty( $bp_uri[1] ) ) || in_array( 'wp-load.php', $bp_uri ) ) {
</span><span class="cx"> // We are within a member page, set up user id globals
</span><del>- $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[1] );
</del><ins>+ if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
+ $displayed_user_id = bp_core_get_userid( $bp_uri[1] );
+ else
+ $displayed_user_id = bp_core_get_userid_from_nicename( $bp_uri[1] );
</ins><span class="cx">
</span><span class="cx"> unset($bp_uri[0]);
</span><span class="cx"> unset($bp_uri[1]);
</span><span class="lines">@@ -117,7 +120,10 @@
</span><span class="cx"> $is_root_component = true;
</span><span class="cx">
</span><span class="cx"> // We are within a member page, set up user id globals
</span><del>- $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[0] );
</del><ins>+ if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
+ $displayed_user_id = bp_core_get_userid( $bp_uri[1] );
+ else
+ $displayed_user_id = bp_core_get_userid_from_nicename( $bp_uri[1] );
</ins><span class="cx">
</span><span class="cx"> unset($bp_uri[0]);
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (2855 => 2856)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-03-19 09:45:11 UTC (rev 2855)
+++ branches/1.2/bp-core.php 2010-03-19 09:51:12 UTC (rev 2856)
</span><span class="lines">@@ -997,11 +997,33 @@
</span><span class="cx"> function bp_core_get_userid( $username ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( !empty( $username ) )
- return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
</del><ins>+ if ( empty( $username ) )
+ return false;
+
+ return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * bp_core_get_userid_from_nicename()
+ *
+ * Returns the user_id for a user based on their user_nicename.
+ *
+ * @package BuddyPress Core
+ * @param $username str Username to check.
+ * @global $wpdb WordPress DB access object.
+ * @return false on no match
+ * @return int the user ID of the matched user.
+ */
+function bp_core_get_userid_from_nicename( $user_nicename ) {
+ global $wpdb;
+
+ if ( empty( $user_nicename ) )
+ return false;
+
+ return apply_filters( 'bp_core_get_userid_from_nicename', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_nicename = %s", $user_nicename ) ) );
+}
+
+/**
</ins><span class="cx"> * bp_core_get_username()
</span><span class="cx"> *
</span><span class="cx"> * Returns the username for a user based on their user id.
</span></span></pre>
</div>
</div>
</body>
</html>