Changeset 9055

Timestamp:

09/29/2014 06:02:19 PM (10 years ago)

Author:

r-a-y

Message:

bp-legacy: Properly clear cookies when logging out.

When a user logs out, buddypress.js attempts to clear all cookies. However,
this now fails with BP 2.1.

The problem is when we enqueued our JS assets (#5208), we upgraded
jquery.cookie to 1.4.1. v1.4.1 uses a new routine to clear cookies.

This commit updates our clear cookies calls to this updated routine.

Fixes #5909 (2.1-branch).

File:

• branches/2.1/src/bp-templates/bp-legacy/js/buddypress.js (modified) (2 diffs)

branches/2.1/src/bp-templates/bp-legacy/js/buddypress.js

@@ -1559 +1559 @@
     /* Clear BP cookies on logout */
     jq('a.logout').on( 'click', function() {
-        jq.cookie('bp-activity-scope', null, {
+        jq.removeCookie('bp-activity-scope', {
             path: '/'
         });
-        jq.cookie('bp-activity-filter', null, {
+        jq.removeCookie('bp-activity-filter', {
             path: '/'
         });
-        jq.cookie('bp-activity-oldestpage', null, {
+        jq.removeCookie('bp-activity-oldestpage', {
             path: '/'
         });
@@ -1571 +1571 @@
         var objects = [ 'members', 'groups', 'blogs', 'forums' ];
         jq(objects).each( function(i) {
-            jq.cookie('bp-' + objects[i] + '-scope', null, {
+            jq.removeCookie('bp-' + objects[i] + '-scope', {
                 path: '/'
             } );
-            jq.cookie('bp-' + objects[i] + '-filter', null, {
+            jq.removeCookie('bp-' + objects[i] + '-filter', {
                 path: '/'
             } );
-            jq.cookie('bp-' + objects[i] + '-extras', null, {
+            jq.removeCookie('bp-' + objects[i] + '-extras', {
                 path: '/'
             } );