Changeset 10380

Timestamp:

11/25/2015 09:30:35 PM (9 years ago)

Author:

r-a-y

Message:

Make sure search terms are passed when rendering pagination.

r10110 altered the search query parameter for each BuddyPress component
(see #5087). However, we also need to change the search query parameter in
our template loops so pagination will work when a search is in effect.

This commit alters the Members and Groups component template loops to use
the new search query parameter and alters the JS to find the correct search
term value.

See #6745 (2.4-branch).

Location:

branches/2.4/src

Files:

• bp-groups/bp-groups-template.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-templates/bp-legacy/js/buddypress.js (modified) (1 diff)

branches/2.4/src/bp-groups/bp-groups-template.php

@@ -345 +345 @@
 
             if ( ! empty( $search_terms ) ) {
-                $add_args['s'] = urlencode( $search_terms );
+                $query_arg = bp_core_get_component_search_query_arg( 'groups' );
+                $add_args[ $query_arg ] = urlencode( $search_terms );
             }
 

branches/2.4/src/bp-members/bp-members-template.php

@@ -359 +359 @@
 
             if ( ! empty( $search_terms ) ) {
-                $add_args['s'] = urlencode( $search_terms );
+                $query_arg = bp_core_get_component_search_query_arg( 'members' );
+                $add_args[ $query_arg ] = urlencode( $search_terms );
             }
 

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

@@ -978 +978 @@
             // Search terms
             if ( jq('div.dir-search input').length ) {
-                search_terms =  jq('.dir-search input').val();
-
-                if ( ! search_terms && bp_get_querystring('s') ) {
+                search_terms =  jq('.dir-search input');
+
+                if ( ! search_terms.val() && bp_get_querystring( search_terms.attr( 'name' ) ) ) {
                     search_terms = jq('.dir-search input').prop('placeholder');
+                } else {
+                    search_terms = search_terms.val();
                 }
             }