Ticket #6189: 6189.diff

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

@@ -316 +316 @@
                                 $this->pag_arg => '%#%',
                         );
 
+                        $add_args = array();
+
+                        $base = '';
                         if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
-                                $base = remove_query_arg( 's', wp_get_referer() );
-                        } else {
-                                $base = '';
-                        }
+                                $referer_parts = explode( '?', wp_get_referer() );
+                                if ( isset( $referer_parts[1] ) ) {
+                                        wp_parse_str( $referer_parts[1], $add_args );
+                                        if ( isset( $add_args['s'] ) ) {
+                                                unset( $add_args['s'] );
+                                        }
+                                }
 
-                        /**
-                         * Defaults to an empty array to make sure paginate_links()
-                         * won't add the $page_arg to the links which would break
-                         * pagination in case javascript is disabled.
-                         */
-                        $add_args = array();
+                                $base = $referer_parts[0];
+                        }
 
                         if ( ! empty( $search_terms ) ) {
                                 $add_args['s'] = urlencode( $search_terms );