<!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][8688] trunk/src: Only show the xprofile field group tabs in edit mode if there is more than one field group.</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/8688">8688</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-07-24 01:29:00 +0000 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only show the xprofile field group tabs in edit mode if there is more than one field group.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5714">#5714</a>
Props imath, jreeve</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbplegacybuddypressmemberssingleprofileeditphp">trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/edit.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="trunksrcbptemplatesbplegacybuddypressmemberssingleprofileeditphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/edit.php (8687 => 8688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/edit.php 2014-07-24 01:11:05 UTC (rev 8687)
+++ trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/edit.php 2014-07-24 01:29:00 UTC (rev 8688)
</span><span class="lines">@@ -9,11 +9,13 @@
</span><span class="cx">
</span><span class="cx"> <h4><?php printf( __( "Editing '%s' Profile Group", "buddypress" ), bp_get_the_profile_group_name() ); ?></h4>
</span><span class="cx">
</span><del>- <ul class="button-nav">
</del><ins>+ <?php if ( bp_profile_has_multiple_groups() ) : ?>
+ <ul class="button-nav">
</ins><span class="cx">
</span><del>- <?php bp_profile_group_tabs(); ?>
</del><ins>+ <?php bp_profile_group_tabs(); ?>
</ins><span class="cx">
</span><del>- </ul>
</del><ins>+ </ul>
+ <?php endif ;?>
</ins><span class="cx">
</span><span class="cx"> <div class="clear"></div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-template.php (8687 => 8688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-template.php 2014-07-24 01:11:05 UTC (rev 8687)
+++ trunk/src/bp-xprofile/bp-xprofile-template.php 2014-07-24 01:29:00 UTC (rev 8688)
</span><span class="lines">@@ -589,14 +589,46 @@
</span><span class="cx"> return apply_filters( 'bp_get_profile_field_data', xprofile_get_field_data( $field, $user_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_profile_group_tabs() {
- global $bp, $group_name;
</del><ins>+/**
+ * Get all profile field groups.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @return object $groups
+ */
+function bp_profile_get_field_groups() {
+ $groups = wp_cache_get( 'xprofile_groups_inc_empty', 'bp' );
</ins><span class="cx">
</span><del>- if ( !$groups = wp_cache_get( 'xprofile_groups_inc_empty', 'bp' ) ) {
</del><ins>+ if ( empty( $groups ) ) {
</ins><span class="cx"> $groups = BP_XProfile_Group::get( array( 'fetch_fields' => true ) );
</span><span class="cx"> wp_cache_set( 'xprofile_groups_inc_empty', $groups, 'bp' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ return apply_filters( 'bp_profile_get_field_groups', $groups );
+}
+
+/**
+ * Check if there is more than one group of fields for the profile being edited.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @return bool True if there is more than one profile field group.
+ */
+function bp_profile_has_multiple_groups() {
+ $has_multiple_groups = count( (array) bp_profile_get_field_groups() ) > 1;
+ return (bool) apply_filters( 'bp_profile_has_multiple_groups', $has_multiple_groups );
+}
+
+/**
+ * Output the tabs to switch between profile field groups.
+ *
+ * @return string Field group tabs markup.
+ */
+function bp_profile_group_tabs() {
+ global $bp, $group_name;
+
+ $groups = bp_profile_get_field_groups();
+
</ins><span class="cx"> if ( empty( $group_name ) )
</span><span class="cx"> $group_name = bp_profile_group_name(false);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>