Changeset 13724 for trunk/src/bp-activity/bp-activity-template.php

Timestamp:

02/14/2024 06:26:17 AM (21 months ago)

Author:

imath

Message:

Activity: make sure streams are paginated the right way

In [13344] we made sure to avoid the last entry(ies) of the stream to be duplicated if some other members published other entry(ies) just before a user clicked on the "Load More" link.

2 mistakes were made while generating the BP_Activity_Activity MySQL query clause as well as the Load More link query variable causing a regression as some activity entries were wrongly skipped from display each time a user was clicking on this link.

1. The MySQL query clause built in BP_Activity_Activity::get_filter_sql() needs to also include the last inserted Activity ID using the <= operator instead of the < one.
2. The query variable added to the Load More link needs to remain the last inserted Activity ID at the time the stream is first displayed.

Props testovac
Antiprops imath

See #9094
Closes ​https://github.com/buddypress/buddypress/pull/229

File:

• trunk/src/bp-activity/bp-activity-template.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-template.php

@@ -426 +426 @@
         );
 
-        // Try to include the offset arg.
-        $last_displayed_activity = reset( $activities_template->activities );
-        if ( isset( $last_displayed_activity->id ) && $last_displayed_activity->id ) {
-            $load_more_args['offset_lower'] = (int) $last_displayed_activity->id;
+        // Use the first posted offset arg to transport it for each following page links.
+        if ( isset( $_POST['offset_lower'] ) && $_POST['offset_lower'] ) {
+            $load_more_args['offset_lower'] = (int) wp_unslash( $_POST['offset_lower'] );
+
+            // Try to include the offset arg to the second page link.
+        } elseif ( 1 === $activities_template->pag_page ) {
+            $last_displayed_activity = reset( $activities_template->activities );
+            if ( isset( $last_displayed_activity->id ) && $last_displayed_activity->id ) {
+                $load_more_args['offset_lower'] = (int) $last_displayed_activity->id;
+            }
         }