Changeset 10214

Timestamp:

10/08/2015 05:21:52 AM (9 years ago)

Author:

r-a-y

Message:

bp-legacy: Only set activity cookies if they are not null.

When we upgraded jQuery.cookie to v1.4.1 in BuddyPress 2.1.0 (#5208),
null values now get set as cookies. Beforehand, the older version of
jQuery.cookie() did not set null values as a cookie.

This caused an issue on the Activity directory page where the correct tab
was not being selected due to the invalid cookie value.

Fixes #6143.

File:

• trunk/src/bp-templates/bp-legacy/js/buddypress.js (modified) (1 diff)

trunk/src/bp-templates/bp-legacy/js/buddypress.js

@@ -1916 +1916 @@
 function bp_activity_request(scope, filter) {
     /* Save the type and filter to a session cookie */
-    jq.cookie( 'bp-activity-scope', scope, {
-        path: '/'
-    } );
-    jq.cookie( 'bp-activity-filter', filter, {
-        path: '/'
-    } );
+    if ( null !== scope ) {
+        jq.cookie( 'bp-activity-scope', scope, {
+            path: '/'
+        } );
+    }
+    if ( null !== filter ) {
+        jq.cookie( 'bp-activity-filter', filter, {
+            path: '/'
+        } );
+    }
     jq.cookie( 'bp-activity-oldestpage', 1, {
         path: '/'