<!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][12768] trunk/src: Declare `$get_data = false` when calling `xprofile_get_field()`.</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12768">12768</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12768","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-26 14:11:53 +0000 (Mon, 26 Oct 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Declare `$get_data = false` when calling `xprofile_get_field()`.
The default value of `$get_data` is `true`, which means that when calling
`xprofile_get_field()` with no explicit `$user_id`, but with a logged-in user,
`BP_XProfile_Field::populate()` will attempt to fetch the user's data. This
is usually neither intended nor needed, and results in unnecessary database
overhead.
See <a href="http://buddypress.trac.wordpress.org/ticket/8378">#8378</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpsignupphp">trunk/src/bp-members/classes/class-bp-signup.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileadminphp">trunk/src/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofilecapsphp">trunk/src/bp-xprofile/bp-xprofile-caps.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofilefiltersphp">trunk/src/bp-xprofile/bp-xprofile-filters.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofilefunctionsphp">trunk/src/bp-xprofile/bp-xprofile-functions.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofiletemplatephp">trunk/src/bp-xprofile/bp-xprofile-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-functions.php 2020-10-24 14:07:19 UTC (rev 12767)
+++ trunk/src/bp-members/bp-members-functions.php 2020-10-26 14:11:53 UTC (rev 12768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2131,7 +2131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $user['meta'][ $key ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $visibility_level = $user['meta'][ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $vfield = xprofile_get_field( $field_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $vfield = xprofile_get_field( $field_id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> $visibility_level = isset( $vfield->default_visibility ) ? $vfield->default_visibility : 'public';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
</span></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/classes/class-bp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-signup.php 2020-10-24 14:07:19 UTC (rev 12767)
+++ trunk/src/bp-members/classes/class-bp-signup.php 2020-10-26 14:11:53 UTC (rev 12768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,7 +412,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $usermeta[ $key ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $visibility_level = $usermeta[ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $vfield = xprofile_get_field( $field_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $vfield = xprofile_get_field( $field_id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> $visibility_level = isset( $vfield->default_visibility ) ? $vfield->default_visibility : 'public';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-admin.php 2020-10-24 14:07:19 UTC (rev 12767)
+++ trunk/src/bp-xprofile/bp-xprofile-admin.php 2020-10-26 14:11:53 UTC (rev 12768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $group->fields as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load the field.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = xprofile_get_field( $field->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = xprofile_get_field( $field->id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $field->can_delete ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_null( $field_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $field = new BP_XProfile_Field();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = xprofile_get_field( $field_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = xprofile_get_field( $field_id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $field->group_id = $group_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,7 +615,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Handle the deletion of field
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = xprofile_get_field( $field_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = xprofile_get_field( $field_id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$field->delete( (bool) $delete_data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: the field type */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,7 +650,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> die( '-1' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = xprofile_get_field( $field_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = xprofile_get_field( $field_id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $base_url = remove_query_arg( array( 'mode', 'field_id', 'bp_xprofile_delete_field' ), $_SERVER['REQUEST_URI'] ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofilecapsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-caps.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-caps.php 2020-10-24 14:07:19 UTC (rev 12767)
+++ trunk/src/bp-xprofile/bp-xprofile-caps.php 2020-10-26 14:11:53 UTC (rev 12768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_xprofile_grant_bp_xprofile_change_field_visibility_for_logged_out_users( $user_can, $user_id, $capability ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'bp_xprofile_change_field_visibility' === $capability && 0 === $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $field_id = bp_get_the_profile_field_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $field_id && $field = xprofile_get_field( $field_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $field_id && $field = xprofile_get_field( $field_id, null, false ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_can = 'allowed' === $field->allow_custom_visibility;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofilefiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-filters.php 2020-10-24 14:07:19 UTC (rev 12767)
+++ trunk/src/bp-xprofile/bp-xprofile-filters.php 2020-10-26 14:11:53 UTC (rev 12768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function xprofile_filter_format_field_value_by_field_id( $field_value, $field_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = xprofile_get_field( $field_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = xprofile_get_field( $field_id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> return xprofile_filter_format_field_value_by_type( $field_value, $field->type, $field_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-functions.php 2020-10-24 14:07:19 UTC (rev 12767)
+++ trunk/src/bp-xprofile/bp-xprofile-functions.php 2020-10-26 14:11:53 UTC (rev 12768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Instantiate a new field object.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $r['field_id'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = xprofile_get_field( $r['field_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = xprofile_get_field( $r['field_id'], null, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $field = new BP_XProfile_Field;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_level = isset( $current_levels[ $field_id ] ) ? $current_levels[ $field_id ] : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use the user's stored level, unless custom visibility is disabled.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = xprofile_get_field( $field_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = xprofile_get_field( $field_id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $field->allow_custom_visibility ) && 'disabled' === $field->allow_custom_visibility ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_level = $field->default_visibility;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1099,7 +1099,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $field_id = bp_get_the_profile_field_id();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = xprofile_get_field( $field_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = xprofile_get_field( $field_id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $enabled = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $field instanceof BP_XProfile_Field ) {
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-template.php 2020-10-24 14:07:19 UTC (rev 12767)
+++ trunk/src/bp-xprofile/bp-xprofile-template.php 2020-10-26 14:11:53 UTC (rev 12768)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -767,7 +767,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * However, we have to make sure that all data originally in $field gets merged back in, after reinstantiation.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! method_exists( $field, 'get_children' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field_obj = xprofile_get_field( $field->id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field_obj = xprofile_get_field( $field->id, null, false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $field as $field_prop => $field_prop_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $field_obj->{$field_prop} ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>