<!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][7915] trunk: Don't use fetch_default_visibility_levels() method in bp_has_profile() loop</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 { 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7915">7915</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-02-17 19:54:32 +0000 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use fetch_default_visibility_levels() method in bp_has_profile() loop
There's no need to do this custom pre-fetching of visibility levels within
the bp_has_profile() loop, because the values are already loaded into the cache
by bp_xprofile_update_meta_cache(). So we use bp_xprofile_get_meta() instead.
See <a href="http://buddypress.trac.wordpress.org/ticket/5398">#5398</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkteststestcasesxprofileclassbpxprofilegroupphp">trunk/tests/testcases/xprofile/class-bp-xprofile-group.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 (7914 => 7915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php 2014-02-17 19:42:03 UTC (rev 7914)
+++ trunk/bp-xprofile/bp-xprofile-classes.php 2014-02-17 19:54:32 UTC (rev 7915)
</span><span class="lines">@@ -265,6 +265,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Prime the meta cache, if necessary
+ if ( $update_meta_cache ) {
+ bp_xprofile_update_meta_cache( $object_ids );
+ }
+
</ins><span class="cx"> // Maybe fetch visibility levels
</span><span class="cx"> if ( !empty( $fetch_visibility_level ) ) {
</span><span class="cx"> $fields = self::fetch_visibility_level( $user_id, $fields );
</span><span class="lines">@@ -293,11 +298,6 @@
</span><span class="cx"> $groups = array_values( $groups );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Prime the meta cache, if necessary
- if ( $update_meta_cache ) {
- bp_xprofile_update_meta_cache( $object_ids );
- }
-
</del><span class="cx"> return $groups;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -393,13 +393,10 @@
</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="cx">
</span><del>- // Get the admin-set preferences
- $admin_set_levels = self::fetch_default_visibility_levels();
-
</del><span class="cx"> foreach( (array) $fields as $key => $field ) {
</span><span class="cx">
</span><span class="cx"> // Does the admin allow this field to be customized?
</span><del>- $allow_custom = empty( $admin_set_levels[$field->id]['allow_custom'] ) || 'allowed' == $admin_set_levels[$field->id]['allow_custom'];
</del><ins>+ $allow_custom = 'disabled' !== bp_xprofile_get_meta( $field->id, 'field', 'allow_custom_visibility' );
</ins><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="lines">@@ -407,7 +404,8 @@
</span><span class="cx">
</span><span class="cx"> // If no admin-set default is saved, fall back on a global default
</span><span class="cx"> } else {
</span><del>- $field_visibility = !empty( $admin_set_levels[$field->id]['default'] ) ? $admin_set_levels[$field->id]['default'] : apply_filters( 'bp_xprofile_default_visibility_level', 'public' );
</del><ins>+ $fallback_visibility = bp_xprofile_get_meta( $field->id, 'field', 'default_visibility' );
+ $field_visibility = ! empty( $fallback_visibility ) ? $fallback_visibility : apply_filters( 'bp_xprofile_default_visibility_level', 'public' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $fields[$key]->visibility_level = $field_visibility;
</span></span></pre></div>
<a id="trunkteststestcasesxprofileclassbpxprofilegroupphp"></a>
<div class="addfile"><h4>Added: trunk/tests/testcases/xprofile/class-bp-xprofile-group.php (0 => 7915)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/xprofile/class-bp-xprofile-group.php (rev 0)
+++ trunk/tests/testcases/xprofile/class-bp-xprofile-group.php 2014-02-17 19:54:32 UTC (rev 7915)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+<?php
+
+/**
+ * @group BP_XProfile_Group
+ * @group xprofile
+ */
+class BP_Tests_BP_XProfile_Group extends BP_UnitTestCase {
+ /**
+ * @group fetch_visibility_level
+ */
+ public function test_fetch_visibility_level() {
+ $u = $this->create_user();
+ $g = $this->factory->xprofile_group->create();
+ $f = $this->factory->xprofile_field->create( array(
+ 'type' => 'textbox',
+ 'field_group_id' => $g,
+ ) );
+
+ $f_obj = new BP_XProfile_Field( $f );
+
+ $fields = array(
+ 0 => new stdClass,
+ );
+
+ $fields[0]->id = $f;
+ $fields[0]->name = $f_obj->name;
+ $fields[0]->description = $f_obj->description;
+ $fields[0]->type = $f_obj->type;
+ $fields[0]->group_id = $f_obj->group_id;
+ $fields[0]->is_required = $f_obj->is_required;
+ $fields[0]->data = new stdClass;
+ $fields[0]->data->value = 'foo';
+ $fields[0]->data->id = 123;
+
+ // custom visibility enabled, but no fallback
+ bp_xprofile_update_meta( $f, 'field', 'default_visibility', 'adminsonly' );
+ bp_xprofile_update_meta( $f, 'field', 'allow_custom_visibility', 'enabled' );
+
+ $found = BP_XProfile_Group::fetch_visibility_level( $u, $fields );
+
+ $expected = $fields;
+ $expected[0]->visibility_level = 'adminsonly';
+
+ $this->assertSame( $expected, $found );
+
+ // custom visibility enabled, with user-provided value
+ bp_xprofile_update_meta( $f, 'field', 'default_visibility', 'adminsonly' );
+ bp_xprofile_update_meta( $f, 'field', 'allow_custom_visibility', 'enabled' );
+ xprofile_set_field_visibility_level( $f, $u, 'public' );
+
+ $found = BP_XProfile_Group::fetch_visibility_level( $u, $fields );
+
+ $expected = $fields;
+ $expected[0]->visibility_level = 'public';
+
+ $this->assertSame( $expected, $found );
+
+ // custom visibility disabled
+ bp_xprofile_update_meta( $f, 'field', 'default_visibility', 'adminsonly' );
+ bp_xprofile_update_meta( $f, 'field', 'allow_custom_visibility', 'disabled' );
+ xprofile_set_field_visibility_level( $f, $u, 'public' );
+
+ $found = BP_XProfile_Group::fetch_visibility_level( $u, $fields );
+
+ $expected = $fields;
+ $expected[0]->visibility_level = 'adminsonly';
+
+ $this->assertSame( $expected, $found );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>