<!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][5385] trunk/bp-core/bp-core-buddybar.php: Provides a valid fallback redirect for situations where the default component is set to something that is unavailable for the logged-in user (such as messages, when viewing someone else's profile).</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/5385">5385</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-11-27 04:08:51 +0000 (Sun, 27 Nov 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Provides a valid fallback redirect for situations where the default component is set to something that is unavailable for the logged-in user (such as messages, when viewing someone else's profile). Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3707">#3707</a></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 (5384 => 5385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php        2011-11-27 03:47:08 UTC (rev 5384)
+++ trunk/bp-core/bp-core-buddybar.php        2011-11-27 04:08:51 UTC (rev 5385)
</span><span class="lines">@@ -259,10 +259,25 @@
</span><span class="cx">                         // When the content is off-limits, we handle the situation differently
</span><span class="cx">                         // depending on whether the current user is logged in
</span><span class="cx">                         if ( is_user_logged_in() ) {
</span><ins>+                                if ( !bp_is_my_profile() &amp;&amp; !$bp-&gt;bp_nav[$bp-&gt;default_component]['show_for_displayed_user'] ) {
+                                        // This covers the edge case where the default component is
+                                        // a non-public tab, like 'messages'
+                                        if ( bp_is_active( 'activity' ) &amp;&amp; isset( $bp-&gt;pages-&gt;activity ) ) {
+                                                $redirect_to = bp_displayed_user_domain() . bp_get_activity_slug();
+                                        } else {
+                                                $redirect_to = bp_displayed_user_domain() . ( 'xprofile' == $bp-&gt;profile-&gt;id ? 'profile' : $bp-&gt;profile-&gt;id );
+                                        }
+                                        
+                                        $message     = '';
+                                } else {
+                                        $message     = __( 'You do not have access to this page.', 'buddypress' );
+                                        $redirect_to = bp_displayed_user_domain();
+                                }
+                                
</ins><span class="cx">                                 // Off-limits to this user. Throw an error and redirect to the displayed user's domain
</span><span class="cx">                                 bp_core_no_access( array(
</span><del>-                                        'message'  =&gt; __( 'You do not have access to this page.', 'buddypress' ),
-                                        'root'     =&gt; bp_displayed_user_domain(),
</del><ins>+                                        'message'  =&gt; $message,
+                                        'root'     =&gt; $redirect_to,
</ins><span class="cx">                                         'redirect' =&gt; false
</span><span class="cx">                                 ) );
</span><span class="cx">                         } else {
</span></span></pre>
</div>
</div>

</body>
</html>