Ticket #4535: 4535.patch

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

@@ -272 +272 @@
                         'primary_id'        => $primary_id,  // Object ID to filter on e.g. a group_id or blog_id etc.
                         'secondary_id'      => false,        // Secondary object ID to filter on e.g. a post_id.
                         'offset'            => false,        // Return only items >= this ID.
+                        'offset_lower'      => false,        // Return only items < this ID.
                         'since'             => false,        // Return only items recorded since this Y-m-d H:i:s date.
 
                         'meta_query'        => false,        // Filter on activity meta. See WP_Meta_Query for format.
@@ -326 +327 @@
                 $r['filter'] = array(
                         'object' => $_GET['afilter']
                 );
-        } elseif ( ! empty( $r['user_id'] ) || ! empty( $r['object'] ) || ! empty( $r['action'] ) || ! empty( $r['primary_id'] ) || ! empty( $r['secondary_id'] ) || ! empty( $r['offset'] ) || ! empty( $r['since'] ) ) {
+        } elseif ( ! empty( $r['user_id'] ) || ! empty( $r['object'] ) || ! empty( $r['action'] ) || ! empty( $r['primary_id'] ) || ! empty( $r['secondary_id'] ) || ! empty( $r['offset'] ) || ! empty( $r['offset_lower'] ) || ! empty( $r['since'] ) ) {
                 $r['filter'] = array(
                         'user_id'      => $r['user_id'],
                         'object'       => $r['object'],
@@ -334 +335 @@
                         'primary_id'   => $r['primary_id'],
                         'secondary_id' => $r['secondary_id'],
                         'offset'       => $r['offset'],
+                        'offset_lower' => $r['offset_lower'],
                         'since'        => $r['since']
                 );
         } else {
@@ -410 +412 @@
         function bp_get_activity_load_more_link() {
                 global $activities_template;
 
-                $url  = bp_get_requested_url();
-                $link = add_query_arg( $activities_template->pag_arg, $activities_template->pag_page + 1, $url );
+                $url            = bp_get_requested_url();
+                $load_more_args = array(
+                        $activities_template->pag_arg => $activities_template->pag_page + 1,
+                );
+
+                // 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;
+                }
+
+                $link = add_query_arg( $load_more_args, $url );
 
                 /**
                  * Filters the Load More link URL.

src/bp-activity/classes/class-bp-activity-activity.php

@@ -1868 +1868 @@
          *                                          'secondary_item_id' column in the database.
          *     @type int              $offset       Return only those items with an ID greater
          *                                          than the offset value.
+         *     @type int              $offset_lower Return only those items with an ID lower
+         *                                          than the offset value.
          *     @type string           $since        Return only those items that have a
          *                                          date_recorded value greater than a
          *                                          given MySQL-formatted date.
@@ -1913 +1915 @@
                         $filter_sql[] = "a.id >= {$sid_sql}";
                 }
 
+                if ( ! empty( $filter_array['offset_lower'] ) ) {
+                        $sid_sql = absint( $filter_array['offset_lower'] );
+                        $filter_sql[] = "a.id < {$sid_sql}";
+                }
+
                 if ( ! empty( $filter_array['since'] ) ) {
                         // Validate that this is a proper Y-m-d H:i:s date.
                         // Trick: parse to UNIX date then translate back.

src/bp-templates/bp-nouveau/includes/functions.php

@@ -117 +117 @@
                 $qs[] = 'offset=' . intval( $post_query['offset'] );
         }
 
+        if ( ! empty( $post_query['offset_lower'] ) ) {
+                $qs[] = 'offset_lower=' . intval( $post_query['offset_lower'] );
+        }
+
         $object_search_text = bp_get_search_default_text( $object );
         if ( ! empty( $post_query['search_terms'] ) && $object_search_text != $post_query['search_terms'] && 'false' != $post_query['search_terms'] && 'undefined' != $post_query['search_terms'] ) {
                 $qs[] = 'search_terms=' . urlencode( $_POST['search_terms'] );

src/bp-templates/bp-nouveau/js/buddypress-activity.js

@@ -273 +273 @@
 
                         // Load more activities
                         } else if ( $( event.currentTarget ).hasClass( 'load-more' ) ) {
-                                var next_page = ( Number( this.current_page ) * 1 ) + 1, self = this, search_terms = '';
+                                var next_page = ( Number( this.current_page ) * 1 ) + 1, self = this, search_terms = '',
+                                    loadMoreLink = $( event.currentTarget ).children().first();
+                                    offsetLower  = loadMoreLink ? bp.Nouveau.getLinkParams( loadMoreLink.prop( 'href' ), 'offset_lower' ) : 0;
 
                                 // Stop event propagation
                                 event.preventDefault();
 
-                                $( event.currentTarget ).find( 'a' ).first().addClass( 'loading' );
+                                loadMoreLink.addClass( 'loading' );
 
                                 // reset the just posted
                                 this.just_posted = [];
@@ -300 +302 @@
                                         page                : next_page,
                                         method              : 'append',
                                         exclude_just_posted : this.just_posted.join( ',' ),
+                                        offset_lower        : offsetLower,
                                         target              : '#buddypress [data-bp-list] ul.bp-list'
                                 } ).done( function( response ) {
                                         if ( true === response.success ) {