Changeset 11887

Timestamp:

03/05/2018 11:10:35 AM (7 years ago)

Author:

djpaul

Message:

Templates, Legacy: don't set bp-activity-oldestpage until needed.

Fixes #7699

Props chherbst

File:

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

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

@@ -438 +438 @@
             jq('#buddypress li.load-more').addClass('loading');
 
-            if ( null === jq.cookie('bp-activity-oldestpage') ) {
+            if ( ! jq.cookie('bp-activity-oldestpage') ) {
                 jq.cookie('bp-activity-oldestpage', 1, {
                     path: '/',
@@ -1739 +1739 @@
 /* Setup activity scope and filter based on the current cookie settings. */
 function bp_init_activity() {
-    /* Reset the page */
-    jq.cookie( 'bp-activity-oldestpage', 1, {
-        path: '/',
-        secure: ( 'https:' === window.location.protocol )
-    } );
-
     if ( undefined !== jq.cookie('bp-activity-filter') && jq('#activity-filter-select').length ) {
         jq('#activity-filter-select select option[value="' + jq.cookie('bp-activity-filter') + '"]').prop( 'selected', true );