<!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][7747] trunk: Does not display change-avatar user nav and screens if WordPress Show avatars setting is disabled</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/7747">7747</a></dd>
<dt>Author</dt> <dd>imath</dd>
<dt>Date</dt> <dd>2014-01-21 01:47:10 +0000 (Tue, 21 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Does not display change-avatar user nav and screens if WordPress Show avatars setting is disabled
If WordPress discussion Avatar display setting is not activated, then displaying change-avatar user nav and screens is not necessary and might confuse the user as his uploaded avatar will not display.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5346">#5346</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersadminbarphp">trunk/bp-members/bp-members-adminbar.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileloaderphp">trunk/bp-xprofile/bp-xprofile-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-adminbar.php (7746 => 7747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-adminbar.php 2014-01-21 00:35:16 UTC (rev 7746)
+++ trunk/bp-members/bp-members-adminbar.php 2014-01-21 01:47:10 UTC (rev 7747)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> 'href' => bp_displayed_user_domain()
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- if( bp_is_active( 'xprofile' ) ) {
</del><ins>+ if ( bp_is_active( 'xprofile' ) ) {
</ins><span class="cx"> // User Admin > Edit this user's profile
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'parent' => $bp->user_admin_menu_id,
</span><span class="lines">@@ -102,12 +102,15 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // User Admin > Edit this user's avatar
</span><del>- $wp_admin_bar->add_menu( array(
- 'parent' => $bp->user_admin_menu_id,
- 'id' => $bp->user_admin_menu_id . '-change-avatar',
- 'title' => __( "Edit Avatar", 'buddypress' ),
- 'href' => bp_get_members_component_link( 'profile', 'change-avatar' )
- ) );
</del><ins>+ if ( buddypress()->avatar->show_avatars ) {
+ $wp_admin_bar->add_menu( array(
+ 'parent' => $bp->user_admin_menu_id,
+ 'id' => $bp->user_admin_menu_id . '-change-avatar',
+ 'title' => __( "Edit Avatar", 'buddypress' ),
+ 'href' => bp_get_members_component_link( 'profile', 'change-avatar' )
+ ) );
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( bp_is_active( 'settings' ) ) {
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-loader.php (7746 => 7747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-loader.php 2014-01-21 00:35:16 UTC (rev 7746)
+++ trunk/bp-xprofile/bp-xprofile-loader.php 2014-01-21 01:47:10 UTC (rev 7747)
</span><span class="lines">@@ -200,15 +200,17 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Change Avatar
</span><del>- $sub_nav[] = array(
- 'name' => __( 'Change Avatar', 'buddypress' ),
- 'slug' => 'change-avatar',
- 'parent_url' => $profile_link,
- 'parent_slug' => $this->slug,
- 'screen_function' => 'xprofile_screen_change_avatar',
- 'position' => 30,
- 'user_has_access' => bp_core_can_edit_settings()
- );
</del><ins>+ if ( buddypress()->avatar->show_avatars ) {
+ $sub_nav[] = array(
+ 'name' => __( 'Change Avatar', 'buddypress' ),
+ 'slug' => 'change-avatar',
+ 'parent_url' => $profile_link,
+ 'parent_slug' => $this->slug,
+ 'screen_function' => 'xprofile_screen_change_avatar',
+ 'position' => 30,
+ 'user_has_access' => bp_core_can_edit_settings()
+ );
+ }
</ins><span class="cx">
</span><span class="cx"> parent::setup_nav( $main_nav, $sub_nav );
</span><span class="cx"> }
</span><span class="lines">@@ -252,13 +254,15 @@
</span><span class="cx"> 'href' => trailingslashit( $profile_link . 'edit' )
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // Edit Profile
- $wp_admin_nav[] = array(
- 'parent' => 'my-account-' . $this->id,
- 'id' => 'my-account-' . $this->id . '-change-avatar',
- 'title' => __( 'Change Avatar', 'buddypress' ),
- 'href' => trailingslashit( $profile_link . 'change-avatar' )
- );
</del><ins>+ // Edit Avatar
+ if ( buddypress()->avatar->show_avatars ) {
+ $wp_admin_nav[] = array(
+ 'parent' => 'my-account-' . $this->id,
+ 'id' => 'my-account-' . $this->id . '-change-avatar',
+ 'title' => __( 'Change Avatar', 'buddypress' ),
+ 'href' => trailingslashit( $profile_link . 'change-avatar' )
+ );
+ }
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>