<!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][5778] branches/1.5: Use field_id 1 when checking for existing fullname in bp_core_get_user_displayname() fallback, to avoid mismatches in bp-xprofile-fullname-field-name site option.</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/5778">5778</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-02-13 20:45:48 +0000 (Mon, 13 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use field_id 1 when checking for existing fullname in bp_core_get_user_displayname() fallback, to avoid mismatches in bp-xprofile-fullname-field-name site option.
Don't overwrite bp-xprofile-fullname-field-name and bp-xprofile-base-group-name during upgrade if they're already populated.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3725">#3725</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches15bpcoreadminbpcoreschemaphp">branches/1.5/bp-core/admin/bp-core-schema.php</a></li>
<li><a href="#branches15bpmembersbpmembersfunctionsphp">branches/1.5/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches15bpcoreadminbpcoreschemaphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-core/admin/bp-core-schema.php (5777 => 5778)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-core/admin/bp-core-schema.php 2012-02-13 19:42:04 UTC (rev 5777)
+++ branches/1.5/bp-core/admin/bp-core-schema.php 2012-02-13 20:45:48 UTC (rev 5778)
</span><span class="lines">@@ -205,9 +205,15 @@
</span><span class="cx"> $charset_collate = bp_core_set_charset();
</span><span class="cx"> $bp_prefix = bp_core_get_table_prefix();
</span><span class="cx">
</span><del>- bp_update_option( 'bp-xprofile-base-group-name', _x( 'Base', 'First XProfile group name', 'buddypress' ) );
- bp_update_option( 'bp-xprofile-fullname-field-name', _x( 'Name', 'XProfile fullname field name', 'buddypress' ) );
</del><ins>+ // These values should only be updated if they are not already present
+ if ( !$base_group_name = bp_get_option( 'bp-xprofile-base-group-name' ) ) {
+ bp_update_option( 'bp-xprofile-base-group-name', _x( 'Base', 'First XProfile group name', 'buddypress' ) );
+ }
</ins><span class="cx">
</span><ins>+ if ( !$fullname_field_name = bp_get_option( 'bp-xprofile-fullname-field-name' ) ) {
+ bp_update_option( 'bp-xprofile-fullname-field-name', _x( 'Name', 'XProfile fullname field name', 'buddypress' ) );
+ }
+
</ins><span class="cx"> $sql[] = "CREATE TABLE {$bp_prefix}bp_xprofile_groups (
</span><span class="cx"> id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
</span><span class="cx"> name varchar(150) NOT NULL,
</span></span></pre></div>
<a id="branches15bpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-members/bp-members-functions.php (5777 => 5778)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-members/bp-members-functions.php 2012-02-13 19:42:04 UTC (rev 5777)
+++ branches/1.5/bp-members/bp-members-functions.php 2012-02-13 20:45:48 UTC (rev 5778)
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !$fullname = wp_cache_get( 'bp_user_fullname_' . $user_id, 'bp' ) ) {
</span><span class="cx"> if ( bp_is_active( 'xprofile' ) ) {
</span><del>- $fullname = xprofile_get_field_data( stripslashes( $bp->site_options['bp-xprofile-fullname-field-name'] ), $user_id );
</del><ins>+ $fullname = xprofile_get_field_data( 1, $user_id );
</ins><span class="cx">
</span><span class="cx"> if ( empty($fullname) ) {
</span><span class="cx"> $ud = bp_core_get_core_userdata( $user_id );
</span><span class="lines">@@ -702,4 +702,4 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>