Ticket #5779: 5779.02.patch

src/bp-activity/bp-activity-filters.php

@@ -459 +459 @@
         if ( empty( $activity_date ) ) {
                 return $classes;
         }
-        
+
         $classes .= ' date-recorded-' . strtotime( $activity_date );
 
         return $classes;
@@ -492 +492 @@
                 'activity_latest_args'
         );
 
+        if ( ! empty( $data['bp_activity_last_recorded_search_terms'] ) && empty( $activity_latest_args['search_terms'] ) ) {
+                $activity_latest_args['search_terms'] = addslashes( $data['bp_activity_last_recorded_search_terms'] );
+        }
+
         $newest_activities = array();
         $last_activity_recorded = 0;
 

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

@@ -416 +416 @@
                                 just_posted.push( jq(this).attr('id').replace( 'activity-','' ) );
                         });
 
-                        bp_ajax_request = jq.post( ajaxurl, {
+                        load_more_args = {
                                 action: 'activity_get_older_updates',
                                 'cookie': bp_get_cookies(),
                                 'page': oldest_page,
                                 'exclude_just_posted': just_posted.join(',')
-                        },
+                        }
+
+                        load_more_search = bp_get_querystring('s');
+
+                        if ( load_more_search ) {
+                                load_more_args.search_terms = load_more_search;
+                        }
+
+                        bp_ajax_request = jq.post( ajaxurl, load_more_args,
                         function(response)
                         {
                                 jq('#buddypress li.load-more').removeClass('loading');
@@ -1612 +1620 @@
                 }
 
                 data.bp_activity_last_recorded = activity_last_recorded;
+
+                last_recorded_search = bp_get_querystring('s');
+
+                if ( last_recorded_search ) {
+                        data.bp_activity_last_recorded_search_terms = last_recorded_search;
+                }
         });
 
         // Increment newest_activities and activity_last_recorded if data has been returned