Ticket #6745: 6745.01.patch

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

@@ -344 +344 @@
                         );
 
                         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 );
                         }
 
                         $this->pag_links = paginate_links( array(

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

@@ -358 +358 @@
                         $add_args = array();
 
                         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 );
                         }
 
                         $this->pag_links = paginate_links( array(

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

@@ -970 +970 @@
                         pagination_id = jq(target).closest('.pagination-links').attr('id');
                         template = null;
 
-                        url_parameters = target.attr('href').split( '&' );
-                        // The page number is the first parameter.
-                        page_number = url_parameters[0].split( '=' );
-                        page_number = page_number[1];
-
                         // Search terms
                         if ( jq('div.dir-search input').length ) {
-                                search_terms =  jq('.dir-search input').val();
+                                search_terms =  jq('.dir-search input');
 
-                                if ( ! search_terms && bp_get_querystring('s') ) {
+                                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();
                                 }
                         }
 
+                        // Page number
+                        if ( jq(target).hasClass('next') || jq(target).hasClass('prev') ) {
+                                page_number = jq('.pagination span.current').html();
+                        } else {
+                                page_number = jq(target).html();
+                        }
+
+                        // Remove any non-numeric characters from page number text (commas, etc.)
+                        page_number = Number( page_number.replace(/\D/g,'') );
+
+                        if ( jq(target).hasClass('next') ) {
+                                page_number++;
+                        } else if ( jq(target).hasClass('prev') ) {
+                                page_number--;
+                        }
+
                         // The Group Members page has a different selector for
                         // its search terms box
                         $gm_search = jq( '.groups-members-search input' );