<!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][6519] trunk: Only register subnav items if user has appropriate authorisation.</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, #logmsg > ol { margin-left: 0; 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/6519">6519</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-11-14 20:29:28 +0000 (Wed, 14 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Only register subnav items if user has appropriate authorisation. See <a href="http://buddypress.trac.wordpress.org/ticket/4661">#4661</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagesloaderphp">trunk/bp-messages/bp-messages-loader.php</a></li>
<li><a href="#trunkbpsettingsbpsettingsloaderphp">trunk/bp-settings/bp-settings-loader.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="trunkbpmessagesbpmessagesloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-loader.php (6518 => 6519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-loader.php 2012-11-14 20:04:09 UTC (rev 6518)
+++ trunk/bp-messages/bp-messages-loader.php 2012-11-14 20:29:28 UTC (rev 6519)
</span><span class="lines">@@ -100,6 +100,9 @@
</span><span class="cx"> */
</span><span class="cx"> function setup_nav() {
</span><span class="cx">
</span><ins>+ if ( ! bp_is_my_profile() )
+ return;
+
</ins><span class="cx"> $sub_nav = array();
</span><span class="cx"> $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-loader.php (6518 => 6519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-loader.php 2012-11-14 20:04:09 UTC (rev 6518)
+++ trunk/bp-settings/bp-settings-loader.php 2012-11-14 20:29:28 UTC (rev 6519)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add Delete Account nav item
</span><del>- if ( ! bp_disable_account_deletion() || bp_current_user_can( 'delete_users' ) ) {
</del><ins>+ if ( is_user_logged_in() && ! bp_disable_account_deletion() || bp_current_user_can( 'delete_users' ) ) {
</ins><span class="cx"> $sub_nav[] = array(
</span><span class="cx"> 'name' => __( 'Delete Account', 'buddypress' ),
</span><span class="cx"> 'slug' => 'delete-account',
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-loader.php (6518 => 6519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-loader.php 2012-11-14 20:04:09 UTC (rev 6518)
+++ trunk/bp-xprofile/bp-xprofile-loader.php 2012-11-14 20:29:28 UTC (rev 6519)
</span><span class="lines">@@ -171,25 +171,27 @@
</span><span class="cx"> 'position' => 10
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // Edit Profile
- $sub_nav[] = array(
- 'name' => __( 'Edit', 'buddypress' ),
- 'slug' => 'edit',
- 'parent_url' => $profile_link,
- 'parent_slug' => $this->slug,
- 'screen_function' => 'xprofile_screen_edit_profile',
- 'position' => 20
- );
</del><ins>+ if ( bp_is_my_profile() ) {
+ // Edit Profile
+ $sub_nav[] = array(
+ 'name' => __( 'Edit', 'buddypress' ),
+ 'slug' => 'edit',
+ 'parent_url' => $profile_link,
+ 'parent_slug' => $this->slug,
+ 'screen_function' => 'xprofile_screen_edit_profile',
+ 'position' => 20
+ );
</ins><span class="cx">
</span><del>- // Change Avatar
- $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
- );
</del><ins>+ // Change Avatar
+ $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
+ );
+ }
</ins><span class="cx">
</span><span class="cx"> parent::setup_nav( $main_nav, $sub_nav );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>