<!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] [2273] trunk:
Fixing support for fallback to WP display_name var.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2273</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-06 20:44:44 +0000 (Wed, 06 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing support for fallback to WP display_name var.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (2272 => 2273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-01-06 18:01:09 UTC (rev 2272)
+++ trunk/bp-activity/bp-activity-classes.php 2010-01-06 20:44:44 UTC (rev 2273)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> /* Select conditions */
</span><del>- $select_sql = "SELECT a.*, u.user_email, u.user_nicename, u.user_login";
</del><ins>+ $select_sql = "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name";
</ins><span class="cx">
</span><span class="cx"> if ( function_exists( 'xprofile_install' ) )
</span><span class="cx"> $select_sql .= ", pd.value as user_fullname";
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> $fullname_where = "AND pd.user_id = a.user_id AND pd.field_id = 1";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.component_action = 'activity_comment' AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ) );
</del><ins>+ $descendants = $wpdb->get_results( $wpdb->prepare( "SELECT a.*, u.user_email, u.user_nicename, u.user_login, u.display_name{$fullname_select} FROM {$bp->activity->table_name} a, {$wpdb->users} u{$fullname_from} WHERE u.ID = a.user_id {$fullname_where} AND a.component_action = 'activity_comment' AND a.item_id = %d AND a.mptt_left BETWEEN %d AND %d ORDER BY a.date_recorded ASC", $activity_id, $left, $right ) );
</ins><span class="cx">
</span><span class="cx"> /* Loop descendants and build an assoc array */
</span><span class="cx"> foreach ( $descendants as $d ) {
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2272 => 2273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-01-06 18:01:09 UTC (rev 2272)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-01-06 20:44:44 UTC (rev 2273)
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx"> $content .= '<ul>';
</span><span class="cx"> foreach ( $comment->children as $comment ) {
</span><span class="cx"> if ( !$comment->user_fullname )
</span><del>- $comment->user_fullname = $comment->user_nicename;
</del><ins>+ $comment->user_fullname = $comment->display_name;
</ins><span class="cx">
</span><span class="cx"> $content .= '<li id="acomment-' . $comment->id . '">';
</span><span class="cx"> $content .= '<div class="acomment-avatar">' . bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'width' => 25, 'height' => 25, 'email' => $comment->user_email ) ) . '</div>';
</span></span></pre></div>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (2272 => 2273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2010-01-06 18:01:09 UTC (rev 2272)
+++ trunk/bp-core/bp-core-classes.php 2010-01-06 20:44:44 UTC (rev 2273)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> $sql = array();
</span><span class="cx">
</span><del>- $sql['select_main'] = "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.user_email";
</del><ins>+ $sql['select_main'] = "SELECT DISTINCT u.ID as id, u.user_registered, u.user_nicename, u.user_login, u.display_name, u.user_email";
</ins><span class="cx">
</span><span class="cx"> if ( 'active' == $type || 'online' == $type )
</span><span class="cx"> $sql['select_active'] = ", um.meta_value as last_activity";
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2272 => 2273)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-06 18:01:09 UTC (rev 2272)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-06 20:44:44 UTC (rev 2273)
</span><span class="lines">@@ -234,6 +234,9 @@
</span><span class="cx"> function bp_get_member_name() {
</span><span class="cx"> global $members_template;
</span><span class="cx">
</span><ins>+ if ( empty($members_template->member->fullname) )
+ $members_template->member->fullname = $members_template->member->display_name;
+
</ins><span class="cx"> return apply_filters( 'bp_get_member_name', $members_template->member->fullname );
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'bp_get_member_name', 'wp_filter_kses' );
</span></span></pre>
</div>
</div>
</body>
</html>