<!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][6622] trunk: Toggle displayed/logged-in user for sub-nav.</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/6622">6622</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-12-10 18:47:31 +0000 (Mon, 10 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Toggle displayed/logged-in user for sub-nav. Bail if no menu should be available. Add 'user_has_access' checks where applicable. Reverts r6519. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4661">#4661</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityloaderphp">trunk/bp-activity/bp-activity-loader.php</a></li>
<li><a href="#trunkbpblogsbpblogsloaderphp">trunk/bp-blogs/bp-blogs-loader.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsloaderphp">trunk/bp-friends/bp-friends-loader.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.php</a></li>
<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="trunkbpactivitybpactivityloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-loader.php (6621 => 6622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-loader.php 2012-12-10 17:36:36 UTC (rev 6621)
+++ trunk/bp-activity/bp-activity-loader.php 2012-12-10 18:47:31 UTC (rev 6622)
</span><span class="lines">@@ -128,12 +128,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Determine user to use
</span><del>- if ( bp_displayed_user_domain() )
</del><ins>+ if ( bp_displayed_user_domain() ) {
</ins><span class="cx"> $user_domain = bp_displayed_user_domain();
</span><del>- elseif ( bp_loggedin_user_domain() )
</del><ins>+ } elseif ( bp_loggedin_user_domain() ) {
</ins><span class="cx"> $user_domain = bp_loggedin_user_domain();
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // User link
</span><span class="cx"> $activity_link = trailingslashit( $user_domain . $this->slug );
</span></span></pre></div>
<a id="trunkbpblogsbpblogsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-loader.php (6621 => 6622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-loader.php 2012-12-10 17:36:36 UTC (rev 6621)
+++ trunk/bp-blogs/bp-blogs-loader.php 2012-12-10 18:47:31 UTC (rev 6622)
</span><span class="lines">@@ -116,8 +116,17 @@
</span><span class="cx"> 'item_css_id' => $this->id
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $parent_url = trailingslashit( bp_displayed_user_domain() . bp_get_blogs_slug() );
</del><ins>+ // Determine user to use
+ if ( bp_displayed_user_domain() ) {
+ $user_domain = bp_displayed_user_domain();
+ } elseif ( bp_loggedin_user_domain() ) {
+ $user_domain = bp_loggedin_user_domain();
+ } else {
+ return;
+ }
</ins><span class="cx">
</span><ins>+ $parent_url = trailingslashit( $user_domain . bp_get_blogs_slug() );
+
</ins><span class="cx"> $sub_nav[] = array(
</span><span class="cx"> 'name' => __( 'My Sites', 'buddypress' ),
</span><span class="cx"> 'slug' => 'my-sites',
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-loader.php (6621 => 6622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-loader.php 2012-12-10 17:36:36 UTC (rev 6621)
+++ trunk/bp-friends/bp-friends-loader.php 2012-12-10 18:47:31 UTC (rev 6622)
</span><span class="lines">@@ -102,8 +102,17 @@
</span><span class="cx"> 'item_css_id' => $bp->friends->id
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $friends_link = trailingslashit( bp_loggedin_user_domain() . bp_get_friends_slug() );
</del><ins>+ // Determine user to use
+ if ( bp_displayed_user_domain() ) {
+ $user_domain = bp_displayed_user_domain();
+ } elseif ( bp_loggedin_user_domain() ) {
+ $user_domain = bp_loggedin_user_domain();
+ } else {
+ return;
+ }
</ins><span class="cx">
</span><ins>+ $friends_link = trailingslashit( $user_domain . bp_get_friends_slug() );
+
</ins><span class="cx"> // Add the subnav items to the friends nav item
</span><span class="cx"> $sub_nav[] = array(
</span><span class="cx"> 'name' => __( 'Friendships', 'buddypress' ),
</span><span class="lines">@@ -122,7 +131,7 @@
</span><span class="cx"> 'parent_slug' => bp_get_friends_slug(),
</span><span class="cx"> 'screen_function' => 'friends_screen_requests',
</span><span class="cx"> 'position' => 20,
</span><del>- 'user_has_access' => bp_is_my_profile()
</del><ins>+ 'user_has_access' => bp_core_can_edit_settings()
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> parent::setup_nav( $main_nav, $sub_nav );
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (6621 => 6622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php 2012-12-10 17:36:36 UTC (rev 6621)
+++ trunk/bp-groups/bp-groups-loader.php 2012-12-10 18:47:31 UTC (rev 6622)
</span><span class="lines">@@ -351,32 +351,43 @@
</span><span class="cx"> 'item_css_id' => $this->id
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $groups_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
</del><ins>+ // Determine user to use
+ if ( bp_displayed_user_domain() ) {
+ $user_domain = bp_displayed_user_domain();
+ } elseif ( bp_loggedin_user_domain() ) {
+ $user_domain = bp_loggedin_user_domain();
+ } else {
+ $user_domain = false;
+ }
</ins><span class="cx">
</span><del>- // Add the My Groups nav item
- $sub_nav[] = array(
- 'name' => __( 'Memberships', 'buddypress' ),
- 'slug' => 'my-groups',
- 'parent_url' => $groups_link,
- 'parent_slug' => $this->slug,
- 'screen_function' => 'groups_screen_my_groups',
- 'position' => 10,
- 'item_css_id' => 'groups-my-groups'
- );
</del><ins>+ if ( !empty( $user_domain ) ) {
+ $groups_link = trailingslashit( $user_domain . $this->slug );
</ins><span class="cx">
</span><del>- // Add the Group Invites nav item
- $sub_nav[] = array(
- 'name' => __( 'Invitations', 'buddypress' ),
- 'slug' => 'invites',
- 'parent_url' => $groups_link,
- 'parent_slug' => $this->slug,
- 'screen_function' => 'groups_screen_group_invites',
- 'user_has_access' => bp_is_my_profile(),
- 'position' => 30
- );
</del><ins>+ // Add the My Groups nav item
+ $sub_nav[] = array(
+ 'name' => __( 'Memberships', 'buddypress' ),
+ 'slug' => 'my-groups',
+ 'parent_url' => $groups_link,
+ 'parent_slug' => $this->slug,
+ 'screen_function' => 'groups_screen_my_groups',
+ 'position' => 10,
+ 'item_css_id' => 'groups-my-groups'
+ );
</ins><span class="cx">
</span><del>- parent::setup_nav( $main_nav, $sub_nav );
</del><ins>+ // Add the Group Invites nav item
+ $sub_nav[] = array(
+ 'name' => __( 'Invitations', 'buddypress' ),
+ 'slug' => 'invites',
+ 'parent_url' => $groups_link,
+ 'parent_slug' => $this->slug,
+ 'screen_function' => 'groups_screen_group_invites',
+ 'user_has_access' => bp_core_can_edit_settings(),
+ 'position' => 30
+ );
</ins><span class="cx">
</span><ins>+ parent::setup_nav( $main_nav, $sub_nav );
+ }
+
</ins><span class="cx"> if ( bp_is_groups_component() && bp_is_single_item() ) {
</span><span class="cx">
</span><span class="cx"> // Reset sub nav
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-loader.php (6621 => 6622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-loader.php 2012-12-10 17:36:36 UTC (rev 6621)
+++ trunk/bp-messages/bp-messages-loader.php 2012-12-10 18:47:31 UTC (rev 6622)
</span><span class="lines">@@ -100,9 +100,6 @@
</span><span class="cx"> */
</span><span class="cx"> function setup_nav() {
</span><span class="cx">
</span><del>- if ( ! bp_is_my_profile() )
- return;
-
</del><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 class="lines">@@ -117,8 +114,17 @@
</span><span class="cx"> 'item_css_id' => $this->id
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ // Determine user to use
+ if ( bp_displayed_user_domain() ) {
+ $user_domain = bp_displayed_user_domain();
+ } elseif ( bp_loggedin_user_domain() ) {
+ $user_domain = bp_loggedin_user_domain();
+ } else {
+ return;
+ }
+
</ins><span class="cx"> // Link to user messages
</span><del>- $messages_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
</del><ins>+ $messages_link = trailingslashit( $user_domain . $this->slug );
</ins><span class="cx">
</span><span class="cx"> // Add the subnav items to the profile
</span><span class="cx"> $sub_nav[] = array(
</span><span class="lines">@@ -128,7 +134,7 @@
</span><span class="cx"> 'parent_slug' => $this->slug,
</span><span class="cx"> 'screen_function' => 'messages_screen_inbox',
</span><span class="cx"> 'position' => 10,
</span><del>- 'user_has_access' => bp_is_my_profile()
</del><ins>+ 'user_has_access' => bp_core_can_edit_settings()
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $sub_nav[] = array(
</span><span class="lines">@@ -138,7 +144,7 @@
</span><span class="cx"> 'parent_slug' => $this->slug,
</span><span class="cx"> 'screen_function' => 'messages_screen_sentbox',
</span><span class="cx"> 'position' => 20,
</span><del>- 'user_has_access' => bp_is_my_profile()
</del><ins>+ 'user_has_access' => bp_core_can_edit_settings()
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $sub_nav[] = array(
</span><span class="lines">@@ -148,7 +154,7 @@
</span><span class="cx"> 'parent_slug' => $this->slug,
</span><span class="cx"> 'screen_function' => 'messages_screen_compose',
</span><span class="cx"> 'position' => 30,
</span><del>- 'user_has_access' => bp_is_my_profile()
</del><ins>+ 'user_has_access' => bp_core_can_edit_settings()
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( bp_current_user_can( 'bp_moderate' ) ) {
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-loader.php (6621 => 6622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-loader.php 2012-12-10 17:36:36 UTC (rev 6621)
+++ trunk/bp-settings/bp-settings-loader.php 2012-12-10 18:47:31 UTC (rev 6622)
</span><span class="lines">@@ -79,12 +79,13 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // Determine user to use
</span><del>- if ( bp_displayed_user_domain() )
</del><ins>+ if ( bp_displayed_user_domain() ) {
</ins><span class="cx"> $user_domain = bp_displayed_user_domain();
</span><del>- elseif ( bp_loggedin_user_domain() )
</del><ins>+ } elseif ( bp_loggedin_user_domain() ) {
</ins><span class="cx"> $user_domain = bp_loggedin_user_domain();
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $settings_link = trailingslashit( $user_domain . $this->slug );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-loader.php (6621 => 6622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-loader.php 2012-12-10 17:36:36 UTC (rev 6621)
+++ trunk/bp-xprofile/bp-xprofile-loader.php 2012-12-10 18:47:31 UTC (rev 6622)
</span><span class="lines">@@ -159,8 +159,17 @@
</span><span class="cx"> 'item_css_id' => $this->id
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $profile_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
</del><ins>+ // Determine user to use
+ if ( bp_displayed_user_domain() ) {
+ $user_domain = bp_displayed_user_domain();
+ } elseif ( bp_loggedin_user_domain() ) {
+ $user_domain = bp_loggedin_user_domain();
+ } else {
+ return;
+ }
</ins><span class="cx">
</span><ins>+ $profile_link = trailingslashit( $user_domain . $this->slug );
+
</ins><span class="cx"> // Add the subnav items to the profile
</span><span class="cx"> $sub_nav[] = array(
</span><span class="cx"> 'name' => __( 'View', 'buddypress' ),
</span><span class="lines">@@ -171,27 +180,27 @@
</span><span class="cx"> 'position' => 10
</span><span class="cx"> );
</span><span class="cx">
</span><del>- 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
- );
</del><ins>+ // 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,
+ 'user_has_access' => bp_core_can_edit_settings()
+ );
</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,
+ '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></pre>
</div>
</div>
</body>
</html>