<!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] [2484] trunk/bp-themes/bp-default/_inc/ajax.php: Fixes #1712</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2484</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-30 16:53:52 +0000 (Sat, 30 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1712</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 (2483 => 2484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-30 14:11:07 UTC (rev 2483)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-30 16:53:52 UTC (rev 2484)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> add_action( 'wp_ajax_delete_activity_comment', 'bp_dtheme_delete_activity' );
</span><span class="cx"> add_action( 'wp_ajax_delete_activity', 'bp_dtheme_delete_activity' );
</span><span class="cx">
</span><del>-function bp_dtheme_activity_loop( $scope = 'all', $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {
</del><ins>+function bp_dtheme_activity_loop( $scope = false, $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {
</ins><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( !$query_string ) {
</span><span class="lines">@@ -173,9 +173,8 @@
</span><span class="cx"> if ( $bp->displayed_user->id ) {
</span><span class="cx"> $query_string = 'user_id=' . $bp->displayed_user->id;
</span><span class="cx"> } else {
</span><del>- /* Make sure a scope is set. */
- if ( empty($scope) )
- $type = 'all';
</del><ins>+ if ( !empty( $bp->groups->current_group ) )
+ $scope = 'all';
</ins><span class="cx">
</span><span class="cx"> $feed_url = site_url( BP_ACTIVITY_SLUG . '/feed/' );
</span><span class="cx">
</span><span class="lines">@@ -216,7 +215,7 @@
</span><span class="cx"> $query_string .= '&action=' . $filter;
</span><span class="cx">
</span><span class="cx"> /* If we are viewing a group then filter the activity just for this group */
</span><del>- if ( $bp->groups->current_group ) {
</del><ins>+ if ( !empty( $bp->groups->current_group ) ) {
</ins><span class="cx"> $query_string .= '&object=' . $bp->groups->id . '&primary_id=' . $bp->groups->current_group->id;
</span><span class="cx">
</span><span class="cx"> /* If we're viewing a non-private group and the user is a member, show the hidden activity for the group */
</span></span></pre>
</div>
</div>
</body>
</html>