Changeset 8817

Timestamp:

08/12/2014 09:04:05 PM (10 years ago)

Author:

imath

Message:

Add search support in Ajax "Load More" and "Load Newest" activity actions

If a search is performed in activities using the query string "?s=search_terms", make sure the search terms are sent in the ajax arguments of the "Load More" and the "Load Newest" actions.

Fixes #5779

Location:

trunk/src

Files:

• bp-activity/bp-activity-filters.php (modified) (2 diffs)
• bp-templates/bp-legacy/js/buddypress.js (modified) (2 diffs)

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

@@ -460 +460 @@
         return $classes;
     }
-    
+
     $classes .= ' date-recorded-' . strtotime( $activity_date );
 
@@ -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();

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

@@ -417 +417 @@
             });
 
-            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)
             {
@@ -1613 +1621 @@
 
         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;
+        }
     });