Changeset 14083

Timestamp:

11/25/2024 03:54:32 PM (2 months ago)

Author:

dcavins

Message:

BP Legacy: load newest activities according to displayed context

Make sure the bp_heartbeat property is included into the sent Heartbeat data object & use it to transport the cookies BP Legacy uses to remember logged in user's navigation preferences.

The bp_heartbeat property is needed to be sure the current Heartbeat request is about BuddyPress and needs to be parsed using the BP Rewrite API since [13752]. This parsing job analyses the current URL to define the value of BP URI globals such as the current displayed single item.

Props dreampixel

Fixes #9248. (14.0 branch)

Location:

branches/14.0/src/bp-templates/bp-legacy

Files:

• buddypress-functions.php (modified) (5 diffs)
• js/buddypress.js (modified) (1 diff)

branches/14.0/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -712 +712 @@
  */
 function bp_legacy_theme_ajax_querystring( $query_string, $object ) {
-    if ( empty( $object ) )
+    if ( empty( $object ) ) {
         return '';
+    }
 
     // Set up the cookies passed on this AJAX request. Store a local var to avoid conflicts.
@@ -720 +721 @@
             str_replace( '; ', '&', urldecode( $_POST['cookie'] ) )
         );
+    } elseif ( ! empty( $_POST['data']['bp_heartbeat'] ) ) {
+        $_BP_COOKIE = bp_parse_args(
+            str_replace( '; ', '&', urldecode( $_POST['data']['bp_heartbeat'] ) )
+        );
     } else {
         $_BP_COOKIE = &$_COOKIE;
@@ -755 +760 @@
 
         // Activity stream scope only on activity directory.
-        if ( 'all' != $_BP_COOKIE['bp-' . $object . '-scope'] && ! bp_displayed_user_id() && ! bp_is_single_item() )
+        if ( 'all' != $_BP_COOKIE['bp-' . $object . '-scope'] && ! bp_displayed_user_id() && ! bp_is_single_item() ) {
             $qs[] = 'scope=' . urlencode( $_BP_COOKIE['bp-' . $object . '-scope'] );
+        }
     }
 
     // If page and search_terms have been passed via the AJAX post request, use those.
-    if ( ! empty( $_POST['page'] ) && '-1' != $_POST['page'] )
+    if ( ! empty( $_POST['page'] ) && '-1' != $_POST['page'] ) {
         $qs[] = 'page=' . absint( $_POST['page'] );
+    }
 
     // Excludes activity just posted and avoids duplicate ids.
@@ -779 +786 @@
 
     $object_search_text = bp_get_search_default_text( $object );
-    if ( ! empty( $_POST['search_terms'] ) && is_string( $_POST['search_terms'] ) && $object_search_text != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
+    if ( ! empty( $_POST['search_terms'] ) && is_string( $_POST['search_terms'] ) && $object_search_text != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] ) {
         $qs[] = 'search_terms=' . urlencode( $_POST['search_terms'] );
+    }
 
     // Now pass the querystring to override default values.
@@ -786 +794 @@
 
     $object_filter = '';
-    if ( isset( $_BP_COOKIE['bp-' . $object . '-filter'] ) )
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-filter'] ) ) {
         $object_filter = $_BP_COOKIE['bp-' . $object . '-filter'];
+    }
 
     $object_scope = '';
-    if ( isset( $_BP_COOKIE['bp-' . $object . '-scope'] ) )
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-scope'] ) ) {
         $object_scope = $_BP_COOKIE['bp-' . $object . '-scope'];
+    }
 
     $object_page = '';
-    if ( isset( $_BP_COOKIE['bp-' . $object . '-page'] ) )
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-page'] ) ) {
         $object_page = $_BP_COOKIE['bp-' . $object . '-page'];
+    }
 
     $object_search_terms = '';
-    if ( isset( $_BP_COOKIE['bp-' . $object . '-search-terms'] ) )
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-search-terms'] ) ) {
         $object_search_terms = $_BP_COOKIE['bp-' . $object . '-search-terms'];
+    }
 
     $object_extras = '';
-    if ( isset( $_BP_COOKIE['bp-' . $object . '-extras'] ) )
+    if ( isset( $_BP_COOKIE['bp-' . $object . '-extras'] ) ) {
         $object_extras = $_BP_COOKIE['bp-' . $object . '-extras'];
+    }
 
     /**

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

@@ -1756 +1756 @@
 
         data.bp_activity_last_recorded = activity_last_recorded;
+        data.bp_heartbeat = bp_get_cookies() || encodeURIComponent( jq.param( { 'bp-activity-scope': null } ) );
 
         last_recorded_search = bp_get_querystring('s');