<!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] [2593] trunk/bp-themes/bp-default/_inc:
Fixing activity scope bugs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2593</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-04 16:03:16 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing activity scope bugs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</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 (2592 => 2593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-02-04 15:39:24 UTC (rev 2592)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-02-04 16:03:16 UTC (rev 2593)
</span><span class="lines">@@ -43,9 +43,8 @@
</span><span class="cx"> $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
</span><span class="cx"> $qs[] = 'user_id=' . $user_id;
</span><span class="cx"> }
</span><del>- if ( 'all' != $_BP_COOKIE['bp-' . $object . '-scope'] )
- $qs[] = 'scope=' . $_BP_COOKIE['bp-' . $object . '-scope']; // Activity stream scope
-
</del><ins>+ if ( 'all' != $_BP_COOKIE['bp-' . $object . '-scope'] && empty( $bp->displayed_user->id ) )
+ $qs[] = 'scope=' . $_BP_COOKIE['bp-' . $object . '-scope']; // Activity stream scope on activity directory.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* If page and search_terms have been passed via the AJAX post request, use those */
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2592 => 2593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-02-04 15:39:24 UTC (rev 2592)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-02-04 16:03:16 UTC (rev 2593)
</span><span class="lines">@@ -1017,8 +1017,8 @@
</span><span class="cx">
</span><span class="cx"> /* Clear BP cookies on logout */
</span><span class="cx"> j('a.logout').click( function() {
</span><del>- j.cookie('bp-activity-scope', null);
- j.cookie('bp-activity-filter', null);
</del><ins>+ j.cookie('bp-activity-scope', null, {path: '/'});
+ j.cookie('bp-activity-filter', null, {path: '/'});
</ins><span class="cx"> j.cookie('bp-activity-oldestpage', null, {path: '/'});
</span><span class="cx">
</span><span class="cx"> var objects = [ 'members', 'groups', 'blogs', 'forums' ];
</span><span class="lines">@@ -1028,6 +1028,11 @@
</span><span class="cx"> j.cookie('bp-' + objects[i] + '-extras', null, {path: '/'} );
</span><span class="cx"> });
</span><span class="cx"> });
</span><ins>+
+ /* On page unload, clear the activity scope. */
+ j(window).unload( function() {
+ j.cookie('bp-activity-scope', null, {path: '/'});
+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /* Setup activity scope and filter based on the current cookie settings. */
</span><span class="lines">@@ -1115,8 +1120,8 @@
</span><span class="cx"> /* Activity Loop Requesting */
</span><span class="cx"> function bp_activity_request(scope, filter) {
</span><span class="cx"> /* Save the type and filter to a session cookie */
</span><del>- j.cookie( 'bp-activity-scope', scope );
- j.cookie( 'bp-activity-filter', filter );
</del><ins>+ j.cookie( 'bp-activity-scope', scope, {path: '/'} );
+ j.cookie( 'bp-activity-filter', filter, {path: '/'} );
</ins><span class="cx"> j.cookie( 'bp-activity-oldestpage', 1 );
</span><span class="cx">
</span><span class="cx"> /* Remove selected and loading classes from tabs */
</span></span></pre>
</div>
</div>
</body>
</html>