<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2247] trunk/bp-themes/bp-default/_inc/ajax.php: Fixes #1538</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>2247</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-04 09:06:29 +0000 (Mon, 04 Jan 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes #1538</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (2246 => 2247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php        2010-01-02 20:25:35 UTC (rev 2246)
+++ trunk/bp-themes/bp-default/_inc/ajax.php        2010-01-04 09:06:29 UTC (rev 2247)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx">                 $search_terms = false;
</span><span class="cx"> 
</span><span class="cx">         /* Build the querystring */
</span><del>-        /* Sort out type ordering */
</del><span class="cx">         if ( 'active' != $filter &amp;&amp; 'newest' != $filter &amp;&amp; 'popular' != $filter &amp;&amp; 'online' != $filter &amp;&amp; 'alphabetical' != $filter )
</span><span class="cx">                 $filter = 'active';
</span><span class="cx"> 
</span><span class="lines">@@ -185,7 +184,7 @@
</span><span class="cx">                                 case 'groups':
</span><span class="cx">                                         $groups = groups_get_user_groups( $bp-&gt;loggedin_user-&gt;id );
</span><span class="cx">                                         $group_ids = implode( ',', $groups['groups'] );
</span><del>-                                        $query_string = 'object=groups&amp;primary_id=' . $group_ids;
</del><ins>+                                        $query_string = 'object=groups&amp;primary_id=' . $group_ids . '&amp;show_hidden=1';
</ins><span class="cx">                                         break;
</span><span class="cx">                                 case 'favorites':
</span><span class="cx">                                         $favs = bp_activity_get_user_favorites( $bp-&gt;loggedin_user-&gt;id );
</span><span class="lines">@@ -207,6 +206,10 @@
</span><span class="cx">                 if ( $bp-&gt;groups-&gt;current_group )
</span><span class="cx">                         $query_string .= '&amp;object=' . $bp-&gt;groups-&gt;id . '&amp;primary_id=' . $bp-&gt;groups-&gt;current_group-&gt;id;
</span><span class="cx"> 
</span><ins>+                /* If we're viewing a non-private group and the user is a member, show the hidden activity for the group */
+                if ( 'public' != $bp-&gt;groups-&gt;current_group-&gt;status &amp;&amp; groups_is_user_member( $bp-&gt;loggedin_user-&gt;id, $bp-&gt;groups-&gt;current_group-&gt;id ) )
+                        $query_string .= '&amp;show_hidden=1';
+
</ins><span class="cx">                 /* Add the per_page param */
</span><span class="cx">                 $query_string .= '&amp;per_page=' . $per_page;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>