<!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][4281] trunk: Fix handling of certain subnav URLs in core, xprofile, friends, members, activity, settings, blogs and message components.</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>4281</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-04-24 15:28:18 +0000 (Sun, 24 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix handling of certain subnav URLs in core, xprofile, friends, members, activity, settings, blogs and message components. See #3176</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="#trunkbpcorebpcorecomponentphp">trunk/bp-core/bp-core-component.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsloaderphp">trunk/bp-friends/bp-friends-loader.php</a></li>
<li><a href="#trunkbpmembersbpmembersloaderphp">trunk/bp-members/bp-members-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 (4280 => 4281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-loader.php 2011-04-24 14:30:26 UTC (rev 4280)
+++ trunk/bp-activity/bp-activity-loader.php 2011-04-24 15:28:18 UTC (rev 4281)
</span><span class="lines">@@ -89,6 +89,16 @@
</span><span class="cx"> function _setup_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Stop if there is no user displayed
+ if ( empty( $bp->displayed_user->id ) )
+ return;
+
+ // Determine user to use
+ if ( !empty( $bp->displayed_user->domain ) )
+ $user_domain = $bp->displayed_user->domain;
+ else
+ return;
+
</ins><span class="cx"> // Add 'Activity' to the main navigation
</span><span class="cx"> $main_nav = array(
</span><span class="cx"> 'name' => __( 'Activity', 'buddypress' ),
</span><span class="lines">@@ -99,18 +109,6 @@
</span><span class="cx"> 'item_css_id' => $this->id
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // Stop if there is no user displayed or logged in
- if ( !is_user_logged_in() && !isset( $bp->displayed_user->id ) )
- return;
-
- // Determine user to use
- if ( isset( $bp->displayed_user->domain ) )
- $user_domain = $bp->displayed_user->domain;
- elseif ( isset( $bp->loggedin_user->domain ) )
- $user_domain = $bp->loggedin_user->domain;
- else
- return;
-
</del><span class="cx"> // User link
</span><span class="cx"> $activity_link = trailingslashit( $user_domain . $this->slug );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpblogsbpblogsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-loader.php (4280 => 4281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-loader.php 2011-04-24 14:30:26 UTC (rev 4280)
+++ trunk/bp-blogs/bp-blogs-loader.php 2011-04-24 15:28:18 UTC (rev 4281)
</span><span class="lines">@@ -101,10 +101,14 @@
</span><span class="cx"> * activity stream.
</span><span class="cx"> */
</span><span class="cx"> if ( !is_multisite() )
</span><del>- return false;
</del><ins>+ return;
</ins><span class="cx">
</span><ins>+ // Stop if there is no user displayed
+ if ( empty( $bp->displayed_user->id ) )
+ return;
+
</ins><span class="cx"> // Add 'Blogs' to the main navigation
</span><del>- $main_nav = array(
</del><ins>+ $main_nav = array(
</ins><span class="cx"> 'name' => sprintf( __( 'Blogs <span>(%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ),
</span><span class="cx"> 'slug' => $this->slug,
</span><span class="cx"> 'position' => 30,
</span></span></pre></div>
<a id="trunkbpcorebpcorecomponentphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-component.php (4280 => 4281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-component.php 2011-04-24 14:30:26 UTC (rev 4280)
+++ trunk/bp-core/bp-core-component.php 2011-04-24 15:28:18 UTC (rev 4281)
</span><span class="lines">@@ -221,7 +221,6 @@
</span><span class="cx"> * @param arr $sub_nav Optional
</span><span class="cx"> */
</span><span class="cx"> function _setup_nav( $main_nav = '', $sub_nav = '' ) {
</span><del>-
</del><span class="cx"> // No sub nav items without a main nav item
</span><span class="cx"> if ( !empty( $main_nav ) ) {
</span><span class="cx"> bp_core_new_nav_item( $main_nav );
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-loader.php (4280 => 4281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-loader.php 2011-04-24 14:30:26 UTC (rev 4280)
+++ trunk/bp-friends/bp-friends-loader.php 2011-04-24 15:28:18 UTC (rev 4281)
</span><span class="lines">@@ -92,6 +92,10 @@
</span><span class="cx"> function _setup_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Stop if there is no user displayed
+ if ( empty( $bp->displayed_user->id ) )
+ return;
+
</ins><span class="cx"> // Add 'Friends' to the main navigation
</span><span class="cx"> $main_nav = array(
</span><span class="cx"> 'name' => sprintf( __( 'Friends <span>(%d)</span>', 'buddypress' ), friends_get_total_friend_count() ),
</span></span></pre></div>
<a id="trunkbpmembersbpmembersloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-loader.php (4280 => 4281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-loader.php 2011-04-24 14:30:26 UTC (rev 4280)
+++ trunk/bp-members/bp-members-loader.php 2011-04-24 15:28:18 UTC (rev 4281)
</span><span class="lines">@@ -143,6 +143,10 @@
</span><span class="cx"> function _setup_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Stop if there is no user displayed and not logged in
+ if ( !is_user_logged_in() && empty( $bp->displayed_user->id ) )
+ return;
+
</ins><span class="cx"> // Add 'Profile' to the main navigation
</span><span class="cx"> if ( !bp_is_active( 'xprofile' ) ) {
</span><span class="cx"> $main_nav = array(
</span><span class="lines">@@ -155,8 +159,8 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> // User links
</span><del>- $user_domain = ( isset( $bp->displayed_user->domain ) ) ? $bp->displayed_user->domain : $bp->loggedin_user->domain;
- $user_login = ( isset( $bp->displayed_user->userdata->user_login ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
</del><ins>+ $user_domain = ( !empty( $bp->displayed_user->domain ) ) ? $bp->displayed_user->domain : $bp->loggedin_user->domain;
+ $user_login = ( !empty( $bp->displayed_user->userdata->user_login ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
</ins><span class="cx"> $profile_link = trailingslashit( $user_domain . $bp->profile->slug );
</span><span class="cx">
</span><span class="cx"> // Add the subnav items to the profile
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-loader.php (4280 => 4281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-loader.php 2011-04-24 14:30:26 UTC (rev 4280)
+++ trunk/bp-messages/bp-messages-loader.php 2011-04-24 15:28:18 UTC (rev 4281)
</span><span class="lines">@@ -92,6 +92,10 @@
</span><span class="cx"> function _setup_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Stop if there is no user displayed
+ if ( empty( $bp->displayed_user->id ) )
+ return;
+
</ins><span class="cx"> if ( $count = messages_get_unread_count() )
</span><span class="cx"> $name = sprintf( __( 'Messages <strong>(%s)</strong>', 'buddypress' ), $count );
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-loader.php (4280 => 4281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-loader.php 2011-04-24 14:30:26 UTC (rev 4280)
+++ trunk/bp-settings/bp-settings-loader.php 2011-04-24 15:28:18 UTC (rev 4281)
</span><span class="lines">@@ -68,6 +68,10 @@
</span><span class="cx"> function _setup_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Stop if there is no user displayed
+ if ( empty( $bp->displayed_user->id ) )
+ return;
+
</ins><span class="cx"> // Add the settings navigation item
</span><span class="cx"> $main_nav = array(
</span><span class="cx"> 'name' => __( 'Settings', 'buddypress' ),
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-loader.php (4280 => 4281)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-loader.php 2011-04-24 14:30:26 UTC (rev 4280)
+++ trunk/bp-xprofile/bp-xprofile-loader.php 2011-04-24 15:28:18 UTC (rev 4281)
</span><span class="lines">@@ -110,6 +110,10 @@
</span><span class="cx"> function _setup_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ // Stop if there is no user displayed
+ if ( empty( $bp->displayed_user->id ) )
+ return;
+
</ins><span class="cx"> // Add 'Profile' to the main navigation
</span><span class="cx"> $main_nav = array(
</span><span class="cx"> 'name' => __( 'Profile', 'buddypress' ),
</span></span></pre>
</div>
</div>
</body>
</html>