<!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][9685] trunk/src/bp-xprofile/bp-xprofile-template.php: XProfile: Mild clean-up to `bp_has_profile()`:</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" 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/9685">9685</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/9685","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-03 15:49:35 +0000 (Fri, 03 Apr 2015)</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'>XProfile: Mild clean-up to `bp_has_profile()`:
* Add phpdoc block
* Remove `extract()` usage
* Small code formatting tweaks
See <a href="http://buddypress.trac.wordpress.org/ticket/6347">#6347</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofiletemplatephp">trunk/src/bp-xprofile/bp-xprofile-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-04-03 13:40:17 UTC (rev 9684)
+++ trunk/src/bp-xprofile/bp-xprofile-template.php 2015-04-03 15:49:35 UTC (rev 9685)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,12 +255,22 @@
</span><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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Query for XProfile groups and fields
+ *
+ * @since BuddyPress (1.0.0)
+ *
+ * @global object $profile_template
+ * @param array $args
+ *
+ * @return bool
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function bp_has_profile( $args = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $profile_template;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Only show empty fields if we're on the Dashboard, or we're on a user's profile edit page,
- // or this is a registration page
- $hide_empty_fields_default = ( !is_network_admin() && !is_admin() && !bp_is_user_profile_edit() && !bp_is_register_page() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only show empty fields if we're on the Dashboard, or we're on a user's
+ // profile edit page, or this is a registration page
+ $hide_empty_fields_default = ( ! is_network_admin() && ! is_admin() && ! bp_is_user_profile_edit() && ! bp_is_register_page() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We only need to fetch visibility levels when viewing your own profile
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_my_profile() || bp_current_user_can( 'bp_moderate' ) || bp_is_register_page() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,24 +279,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $fetch_visibility_level_default = false;
</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">- $defaults = array(
- 'user_id' => bp_displayed_user_id(),
- 'profile_group_id' => false,
- 'hide_empty_groups' => true,
- 'hide_empty_fields' => $hide_empty_fields_default,
- 'fetch_fields' => true,
- 'fetch_field_data' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Parse arguments
+ $r = bp_parse_args( $args, array(
+ 'user_id' => bp_displayed_user_id(),
+ 'profile_group_id' => false,
+ 'hide_empty_groups' => true,
+ 'hide_empty_fields' => $hide_empty_fields_default,
+ 'fetch_fields' => true,
+ 'fetch_field_data' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fetch_visibility_level' => $fetch_visibility_level_default,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exclude_groups' => false, // Comma-separated list of profile field group IDs to exclude
- 'exclude_fields' => false, // Comma-separated list of profile field IDs to exclude
- 'update_meta_cache' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exclude_groups' => false, // Comma-separated list of profile field group IDs to exclude
+ 'exclude_fields' => false, // Comma-separated list of profile field IDs to exclude
+ 'update_meta_cache' => true,
+ ), 'has_profile' );
+
+ // Populate the template loop global
+ $profile_template = new BP_XProfile_Data_Template(
+ $r['user_id'],
+ $r['profile_group_id'],
+ $r['hide_empty_groups'],
+ $r['fetch_fields'],
+ $r['fetch_field_data'],
+ $r['exclude_groups'],
+ $r['exclude_fields'],
+ $r['hide_empty_fields'],
+ $r['fetch_visibility_level'],
+ $r['update_meta_cache']
</ins><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">- $r = bp_parse_args( $args, $defaults, 'has_profile' );
- extract( $r, EXTR_SKIP );
-
- $profile_template = new BP_XProfile_Data_Template( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields, $hide_empty_fields, $fetch_visibility_level, $update_meta_cache );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether or not a group has a profile to display.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>