<!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][6610] trunk/bp-xprofile/bp-xprofile-classes.php: Allow profile field visibility to work when viewing register page.</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/6610">6610</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-12-10 15:02:27 +0000 (Mon, 10 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow profile field visibility to work when viewing register page. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4456">#4456</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (6609 => 6610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2012-12-10 14:43:06 UTC (rev 6609)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2012-12-10 15:02:27 UTC (rev 6610)
</span><span class="lines">@@ -115,15 +115,15 @@
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'profile_group_id' => false,
- 'user_id' => bp_displayed_user_id(),
- 'hide_empty_groups' => false,
- 'hide_empty_fields' => false,
- 'fetch_fields' => false,
- 'fetch_field_data' => false,
</del><ins>+ 'profile_group_id' => false,
+ 'user_id' => bp_displayed_user_id(),
+ 'hide_empty_groups' => false,
+ 'hide_empty_fields' => false,
+ 'fetch_fields' => false,
+ 'fetch_field_data' => false,
</ins><span class="cx"> 'fetch_visibility_level' => false,
</span><del>- 'exclude_groups' => false,
- 'exclude_fields' => false
</del><ins>+ 'exclude_groups' => false,
+ 'exclude_fields' => false
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> if ( empty( $fields ) )
</span><span class="cx"> return $groups;
</span><span class="cx">
</span><del>- if ( ! empty( $fetch_field_data ) && ! empty( $user_id ) ) {
</del><ins>+ if ( ! empty( $fetch_field_data ) ) {
</ins><span class="cx">
</span><span class="cx"> // Fetch the field data for the user.
</span><span class="cx"> foreach( (array) $fields as $field ) {
</span><span class="lines">@@ -184,8 +184,9 @@
</span><span class="cx">
</span><span class="cx"> $field_ids_sql = implode( ',', (array) $field_ids );
</span><span class="cx">
</span><del>- if ( !empty( $field_ids ) )
</del><ins>+ if ( ! empty( $field_ids ) && ! empty( $user_id ) ) {
</ins><span class="cx"> $field_data = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_id, value FROM {$bp->profile->table_name_data} WHERE field_id IN ( {$field_ids_sql} ) AND user_id = %d", $user_id ) );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Remove data-less fields, if necessary
</span><span class="cx"> if ( !empty( $hide_empty_fields ) ) {
</span><span class="lines">@@ -232,7 +233,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $fetch_visibility_level ) {
</del><ins>+ if ( !empty( $fetch_visibility_level ) ) {
</ins><span class="cx"> $fields = self::fetch_visibility_level( $user_id, $fields );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -293,7 +294,7 @@
</span><span class="cx"> * @param array $fields The database results returned by the get() query
</span><span class="cx"> * @return array $fields The database results, with field_visibility added
</span><span class="cx"> */
</span><del>- function fetch_visibility_level( $user_id, $fields ) {
</del><ins>+ function fetch_visibility_level( $user_id = 0, $fields = array() ) {
</ins><span class="cx">
</span><span class="cx"> // Get the user's visibility level preferences
</span><span class="cx"> $visibility_levels = bp_get_user_meta( $user_id, 'bp_xprofile_visibility_levels', true );
</span><span class="lines">@@ -301,15 +302,17 @@
</span><span class="cx"> // Get the admin-set preferences
</span><span class="cx"> $admin_set_levels = self::fetch_default_visibility_levels();
</span><span class="cx">
</span><del>- foreach( (array)$fields as $key => $field ) {
</del><ins>+ foreach( (array) $fields as $key => $field ) {
+
</ins><span class="cx"> // Does the admin allow this field to be customized?
</span><span class="cx"> $allow_custom = empty( $admin_set_levels[$field->id]['allow_custom'] ) || 'allowed' == $admin_set_levels[$field->id]['allow_custom'];
</span><span class="cx">
</span><span class="cx"> // Look to see if the user has set the visibility for this field
</span><span class="cx"> if ( $allow_custom && isset( $visibility_levels[$field->id] ) ) {
</span><span class="cx"> $field_visibility = $visibility_levels[$field->id];
</span><ins>+
+ // If no admin-set default is saved, fall back on a global default
</ins><span class="cx"> } else {
</span><del>- // If no admin-set default is saved, fall back on a global default
</del><span class="cx"> $field_visibility = !empty( $admin_set_levels[$field->id]['default'] ) ? $admin_set_levels[$field->id]['default'] : apply_filters( 'bp_xprofile_default_visibility_level', 'public' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>