Changeset 2593

Timestamp:

02/04/2010 04:03:16 PM (14 years ago)

Author:

apeatling

Message:

Fixing activity scope bugs.

Location:

trunk/bp-themes/bp-default/_inc

Files:

• ajax.php (modified) (1 diff)
• global.js (modified) (3 diffs)

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -44 +44 @@
             $qs[] = 'user_id=' . $user_id;
         }
-        if ( 'all' != $_BP_COOKIE['bp-' . $object . '-scope'] )
-            $qs[] = 'scope=' . $_BP_COOKIE['bp-' . $object . '-scope']; // Activity stream scope
-
+        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.
     }
 

trunk/bp-themes/bp-default/_inc/global.js

@@ -1018 +1018 @@
     /* Clear BP cookies on logout */
     j('a.logout').click( function() {
-        j.cookie('bp-activity-scope', null);
-        j.cookie('bp-activity-filter', null);
+        j.cookie('bp-activity-scope', null, {path: '/'});
+        j.cookie('bp-activity-filter', null, {path: '/'});
         j.cookie('bp-activity-oldestpage', null, {path: '/'});
 
@@ -1028 +1028 @@
             j.cookie('bp-' + objects[i] + '-extras', null, {path: '/'} );
         });
+    });
+
+    /* On page unload, clear the activity scope. */
+    j(window).unload( function() {
+        j.cookie('bp-activity-scope', null, {path: '/'});
     });
 });
@@ -1116 +1121 @@
 function bp_activity_request(scope, filter) {
     /* Save the type and filter to a session cookie */
-    j.cookie( 'bp-activity-scope', scope );
-    j.cookie( 'bp-activity-filter', filter );
+    j.cookie( 'bp-activity-scope', scope, {path: '/'} );
+    j.cookie( 'bp-activity-filter', filter, {path: '/'} );
     j.cookie( 'bp-activity-oldestpage', 1 );