<!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][4599] trunk/bp-core/bp-core-buddybar.php: Fixes 404 and user_has_access rerouting for profile subtabs.</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>4599</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-04 15:00:00 +0000 (Mon, 04 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes 404 and user_has_access rerouting for profile subtabs. Fixes #3311</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (4598 => 4599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2011-07-04 14:30:56 UTC (rev 4598)
+++ trunk/bp-core/bp-core-buddybar.php 2011-07-04 15:00:00 UTC (rev 4599)
</span><span class="lines">@@ -200,20 +200,50 @@
</span><span class="cx"> 'user_has_access' => $user_has_access,
</span><span class="cx"> 'screen_function' => &$screen_function
</span><span class="cx"> );
</span><del>-
- // Look for current component
- if ( ( $bp->current_action == $slug && $bp->current_component == $parent_slug ) && $user_has_access ) {
- if ( !is_object( $screen_function[0] ) )
- add_action( 'bp_screens', $screen_function );
- else
- add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
-
- // Look for current item
- } elseif ( ( $bp->current_action == $slug && $bp->current_item == $parent_slug ) && $user_has_access ) {
- if ( !is_object( $screen_function[0] ) )
- add_action( 'bp_screens', $screen_function );
- else
- add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
</del><ins>+
+ /**
+ * The last step is to hook the screen function for the added subnav item. But this only
+ * needs to be done if this subnav item is the current view, and the user has access to the
+ * subnav item. We figure out whether we're currently viewing this subnav by checking the
+ * following two conditions:
+ * (1) Either:
+ * (a) the parent slug matches the current_component, or
+ * (b) the parent slug matches the current_item
+ * (2) And either:
+ * (a) the current_action matches $slug, or
+ * (b) there is no current_action (ie, this is the default subnav for the parent nav)
+ * and this subnav item is the default for the parent item (which we check by
+ * comparing this subnav item's screen function with the screen function of the
+ * parent nav item in $bp->bp_nav).
+ */
+
+ // If we *don't* meet condition (1), return
+ if ( $bp->current_component != $parent_slug && $bp->current_item != $parent_slug )
+ return;
+
+ // If we *do* meet condition (2), then the added subnav item is currently being requested
+ if ( ( !empty( $bp->current_action ) && $slug == $bp->current_action ) || ( empty( $bp->current_action ) && $screen_function == $bp->bp_nav[$parent_slug]['screen_function'] ) ) {
+ // Before hooking the screen function, check user access
+ if ( $user_has_access ) {
+ if ( !is_object( $screen_function[0] ) )
+ add_action( 'bp_screens', $screen_function );
+ else
+ add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
+ } else {
+ // When the content is off-limits, we handle the situation differently
+ // depending on whether the current user is logged in
+ if ( is_user_logged_in() ) {
+ // Off-limits to this user. Throw an error and redirect to the displayed user's domain
+ bp_core_no_access( array(
+ 'message' => __( 'You do not have access to this page.', 'buddypress' ),
+ 'root' => bp_displayed_user_domain(),
+ 'redirect' => false
+ ) );
+ } else {
+ // Not logged in. Allow the user to log in, and attempt to redirect
+ bp_core_no_access();
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>