Ticket #5768: 5768.02.patch

src/bp-messages/bp-messages-template.php

@@ -173 +173 @@
                 }
 
                 if ( (int) $this->total_thread_count && (int) $this->pag_num ) {
+                        $pag_args = array(
+                                $page_arg => '%#%',
+                        );
+
+                        if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
+                                $base = wp_get_referer();
+                        } else {
+                                $base = '';
+                        }
+
+                        if ( ! empty( $this->search_terms ) ) {
+                                $pag_args['s'] = $this->search_terms;
+                        }
+
                         $this->pag_links = paginate_links( array(
-                                'base'      => add_query_arg( $page_arg, '%#%' ),
+                                'base'      => add_query_arg( $pag_args, $base ),
                                 'format'    => '',
                                 'total'     => ceil( (int) $this->total_thread_count / (int) $this->pag_num ),
                                 'current'   => $this->pag_page,

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

@@ -1689 +1689 @@
                 return false;
         }
 
-        if ( bp_get_querystring('s') && !search_terms ) {
+        if ( bp_get_querystring('s') && !search_terms && 'messages' != object ) {
                 search_terms = bp_get_querystring('s');
         }