Changeset 8931

Timestamp:

08/17/2014 09:56:37 AM (10 years ago)

Author:

djpaul

Message:

Correctly generate pagination links when using AJAX and search terms have been set.
Also improve pagination support for main loops in the Groups/Members/Messages components when JS is disabled.

Fixes #5768, props r-a-y

Location:

trunk/src

Files:

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

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

@@ -235 +235 @@
         // Build pagination links
         if ( (int) $this->total_group_count && (int) $this->pag_num ) {
+            $pag_args = array(
+                $page_arg => '%#%',
+                'num'     => $this->pag_num,
+                'sortby'  => $this->sort_by,
+                'order'   => $this->order,
+            );
+
+            if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
+                $base = remove_query_arg( 's', wp_get_referer() );
+            } else {
+                $base = '';
+            }
+
+            if ( ! empty( $search_terms ) ) {
+                $pag_args['s'] = $search_terms;
+            }
+
             $this->pag_links = paginate_links( array(
-                'base'      => add_query_arg( array( $page_arg => '%#%', 'num' => $this->pag_num, 's' => $search_terms, 'sortby' => $this->sort_by, 'order' => $this->order ) ),
+                'base'      => add_query_arg( $pag_args, $base ),
                 'format'    => '',
                 'total'     => ceil( (int) $this->total_group_count / (int) $this->pag_num ),

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

@@ -265 +265 @@
 
         if ( (int) $this->total_member_count && (int) $this->pag_num ) {
+            $pag_args = array(
+                $page_arg => '%#%',
+            );
+
+            if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
+                $base = remove_query_arg( 's', wp_get_referer() );
+            } else {
+                $base = '';
+            }
+
+            if ( ! empty( $search_terms ) ) {
+                $pag_args['s'] = $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_member_count / (int) $this->pag_num ),

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

@@ -174 +174 @@
 
         if ( (int) $this->total_thread_count && (int) $this->pag_num ) {
+            $pag_args = array(
+                $page_arg => '%#%',
+            );
+
+            if ( defined( 'DOING_AJAX' ) && true === (bool) DOING_AJAX ) {
+                $base = remove_query_arg( 's', 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 ),

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

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