<!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][4890] trunk/bp-members/bp-members-template.php: Ensure that bp_get_member_name() always returns a fullname value.</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/4890">4890</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-28 22:49:48 +0000 (Thu, 28 Jul 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Ensure that bp_get_member_name() always returns a fullname value. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3404">#3404</a>. Props slaFFik</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (4889 => 4890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php        2011-07-28 22:05:40 UTC (rev 4889)
+++ trunk/bp-members/bp-members-template.php        2011-07-28 22:49:48 UTC (rev 4890)
</span><span class="lines">@@ -501,14 +501,47 @@
</span><span class="cx">         function bp_member_link() { echo bp_get_member_permalink(); }
</span><span class="cx">         function bp_get_member_link() { return bp_get_member_permalink(); }
</span><span class="cx"> 
</span><ins>+/**
+ * Echoes bp_get_member_name()
+ *
+ * @package BuddyPress
+ */
</ins><span class="cx"> function bp_member_name() {
</span><span class="cx">         echo apply_filters( 'bp_member_name', bp_get_member_name() );
</span><span class="cx"> }
</span><ins>+        /**
+         * Used inside a bp_has_members() loop, this function returns a user's full name
+         *
+         * Full name is, by default, pulled from xprofile's Full Name field. When this field is
+         * empty, we try to get an alternative name from the WP users table, in the following order
+         * of preference: display_name, user_nicename, user_login.
+         *
+         * @package BuddyPress
+         *
+         * @uses apply_filters() Filter bp_get_the_member_name() to alter the function's output
+         * @return str The user's fullname for display
+         */
</ins><span class="cx">         function bp_get_member_name() {
</span><span class="cx">                 global $members_template;
</span><ins>+                
+                // Generally, this only fires when xprofile is disabled
+                if ( empty( $members_template-&gt;member-&gt;fullname ) ) {
+                        // Our order of preference for alternative fullnames
+                        $name_stack = array(
+                                'display_name',
+                                'user_nicename',
+                                'user_login'
+                        );
</ins><span class="cx"> 
</span><del>-                if ( empty($members_template-&gt;member-&gt;fullname) )
-                        $members_template-&gt;member-&gt;fullname = $members_template-&gt;member-&gt;display_name;
</del><ins>+                        foreach ( $name_stack as $source ) {
+                                if ( !empty( $members_template-&gt;member-&gt;{$source} ) ) {
+                                        // When a value is found, set it as fullname and be done
+                                        // with it
+                                        $members_template-&gt;member-&gt;fullname = $members_template-&gt;member-&gt;{$source};
+                                        break;
+                                }
+                        }
+                }
</ins><span class="cx"> 
</span><span class="cx">                 return apply_filters( 'bp_get_member_name', $members_template-&gt;member-&gt;fullname );
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>