<!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][5373] trunk: 404 when attempting to access the URL of a hidden group.</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/5373">5373</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-11-26 03:44:02 +0000 (Sat, 26 Nov 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>404 when attempting to access the URL of a hidden group. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3462">#3462</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsloaderphp">trunk/bp-groups/bp-groups-loader.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 (5372 => 5373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php        2011-11-26 03:18:59 UTC (rev 5372)
+++ trunk/bp-core/bp-core-buddybar.php        2011-11-26 03:44:02 UTC (rev 5373)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">                         if ( apply_filters( 'bp_guarantee_unique_uris', true ) ) {
</span><span class="cx">                                 bp_core_redirect( bp_get_root_domain() . '/' . bp_get_root_slug( bp_current_component() ) . '/' . $slug . '/' . apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r ) );
</span><span class="cx">                         } else {
</span><del>-                                 $bp-&gt;current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
</del><ins>+                                $bp-&gt;current_action = apply_filters( 'bp_default_component_subnav', $default_subnav_slug, $r );
</ins><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-loader.php (5372 => 5373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-loader.php        2011-11-26 03:18:59 UTC (rev 5372)
+++ trunk/bp-groups/bp-groups-loader.php        2011-11-26 03:44:02 UTC (rev 5373)
</span><span class="lines">@@ -166,21 +166,31 @@
</span><span class="cx">                 // Group access control
</span><span class="cx">                 if ( bp_is_groups_component() &amp;&amp; !empty( $this-&gt;current_group ) ) {
</span><span class="cx"> 
</span><del>-                        if ( !empty( $bp-&gt;current_action ) &amp;&amp; !$this-&gt;current_group-&gt;user_has_access ) {
-                                if ( is_user_logged_in() ) {
-                                        // Off-limits to this user. Throw an error and redirect to the group's home page
-                                        bp_core_no_access( array(
-                                                'message'  =&gt; __( 'You do not have access to this group.', 'buddypress' ),
-                                                'root'     =&gt; bp_get_group_permalink( $bp-&gt;groups-&gt;current_group ),
-                                                'redirect' =&gt; false
-                                        ) );
</del><ins>+                        if ( !$this-&gt;current_group-&gt;user_has_access ) {
+                                if ( 'hidden' == $this-&gt;current_group-&gt;status ) {
+                                        // Hidden groups should return a 404 for non-members.
+                                        // Unset the current group so that you're not redirected
+                                        // to the default group tab
+                                        $this-&gt;current_group = 0;
+                                        $bp-&gt;is_single_item  = false;
+                                        bp_do_404();
+                                        return;
</ins><span class="cx">                                 } else {
</span><del>-                                        // Allow the user to log in
-                                        bp_core_no_access();
</del><ins>+                                        if ( is_user_logged_in() ) {
+                                                // Off-limits to this user. Throw an error and redirect to the group's home page
+                                                bp_core_no_access( array(
+                                                        'message'  =&gt; __( 'You do not have access to this group.', 'buddypress' ),
+                                                        'root'     =&gt; bp_get_group_permalink( $bp-&gt;groups-&gt;current_group ),
+                                                        'redirect' =&gt; false
+                                                ) );
+                                        } else {
+                                                // Allow the user to log in
+                                                bp_core_no_access();
+                                        }
</ins><span class="cx">                                 }
</span><span class="cx"> 
</span><span class="cx">                         // User has access. Default to a particular group extension if not specified on the URL
</span><del>-                        } elseif ( empty( $bp-&gt;current_action ) &amp;&amp; $this-&gt;current_group-&gt;user_has_access ) {
</del><ins>+                        } elseif ( !bp_current_action() ) {
</ins><span class="cx">                                 $bp-&gt;current_action = apply_filters( 'bp_groups_default_extension', defined( 'BP_GROUPS_DEFAULT_EXTENSION' ) ? BP_GROUPS_DEFAULT_EXTENSION :  'home' );
</span><span class="cx">                         }
</span><span class="cx">                 }
</span></span></pre>
</div>
</div>

</body>
</html>