Changeset 3361

Timestamp:

07/14/2011 01:33:23 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Fix pagination issues when using topics shortcode on front page. Also use pagination_base instead of 'page'.

Fixes #1567, #1573. Props scribu.

Location:

branches/plugin/bbp-includes

Files:

• bbp-common-functions.php (modified) (1 diff)
• bbp-reply-template.php (modified) (4 diffs)
• bbp-topic-template.php (modified) (4 diffs)

branches/plugin/bbp-includes/bbp-common-functions.php

@@ -251 +251 @@
  */
 function bbp_get_paged() {
+    global $wp_query;
 
     // Make sure to not paginate widget queries
-    if ( !bbp_is_query_name( 'bbp_widget' ) && ( $paged = get_query_var( 'paged' ) ) )
-        return (int) $paged;
+    if ( !bbp_is_query_name( 'bbp_widget' ) ) {
+
+        // Check the query var
+        if ( get_query_var( 'paged' ) ) {
+            $paged = get_query_var( 'paged' );
+
+        // Check query paged
+        } elseif ( !empty( $wp_query->query[paged] ) ) {
+            $paged = $wp_query->query[paged];
+        }
+
+        // Paged found
+        if ( !empty( $paged ) ) {
+            return (int) $paged;
+        }
+    }
 
     // Default to first page

branches/plugin/bbp-includes/bbp-reply-template.php

@@ -141 +141 @@
         // If pretty permalinks are enabled, make our pagination pretty
         if ( $wp_rewrite->using_permalinks() ) {
-                
+
             // Page or single
             if ( is_page() || is_single() ) {
-                $base = user_trailingslashit( trailingslashit( get_permalink() ) . 'page/%#%/' );
+                $base = get_permalink();
 
             // Topic
             } else {
-                $base = user_trailingslashit( trailingslashit( get_permalink( bbp_get_topic_id() ) ) . 'page/%#%/' );
+                $base = get_permalink( bbp_get_topic_id() );
             }
+
+            $base = trailingslashit( $base ) . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
 
         // Unpretty permalinks
@@ -173 +175 @@
         // Remove first page from pagination
         if ( $wp_rewrite->using_permalinks() )
-            $bbp->reply_query->pagination_links = str_replace( 'page/1/\'',     '\'', $bbp->reply_query->pagination_links );
+            $bbp->reply_query->pagination_links = str_replace( $wp_rewrite->pagination_base . '/1/', '', $bbp->reply_query->pagination_links );
         else
-            $bbp->reply_query->pagination_links = str_replace( '&paged=1', '',   $bbp->reply_query->pagination_links );
+            $bbp->reply_query->pagination_links = str_replace( '&paged=1', '', $bbp->reply_query->pagination_links );
     }
 
@@ -388 +390 @@
             // Pretty permalinks
             if ( $wp_rewrite->using_permalinks() ) {
-                $url = trailingslashit( $topic_url ) . trailingslashit( "page/{$reply_page}" ) . $reply_hash;
+                $url = trailingslashit( $topic_url ) . trailingslashit( $wp_rewrite->pagination_base ) . trailingslashit( $reply_page ) . $reply_hash;
 
             // Yucky links
@@ -528 +530 @@
  */
 function bbp_reply_content_append_revisions( $content = '', $reply_id = 0 ) {
-    
+
     // Bail if in admin
     if ( is_admin() )

branches/plugin/bbp-includes/bbp-topic-template.php

@@ -239 +239 @@
             // Profile page
             if ( bbp_is_single_user() )
-                $base = user_trailingslashit( trailingslashit( bbp_get_user_profile_url( bbp_get_displayed_user_id() ) ) . 'page/%#%/' );
+                $base = bbp_get_user_profile_url( bbp_get_displayed_user_id() );
 
             // View
             elseif ( bbp_is_single_view() )
-                $base = user_trailingslashit( trailingslashit( bbp_get_view_url() ) . 'page/%#%/' );
+                $base = bbp_get_view_url();
 
             // Page or single post
             elseif ( is_page() || is_single() )
-                $base = user_trailingslashit( trailingslashit( get_permalink() ) . 'page/%#%/' );
+                $base = get_permalink();
 
             // Topic archive
             elseif ( bbp_is_topic_archive() )
-                $base = user_trailingslashit( trailingslashit( home_url( $bbp->topic_archive_slug ) ) . 'page/%#%/' );
+                $base = home_url( $bbp->topic_archive_slug );
 
             // Default
             else
-                $base = user_trailingslashit( trailingslashit( get_permalink( $post_parent ) ) . 'page/%#%/' );
+                $base = get_permalink( $post_parent );
+
+            // Use pagination base
+            $base = trailingslashit( $base ) . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
 
         // Unpretty pagination
@@ -277 +280 @@
 
         // Remove first page from pagination
-        $bbp->topic_query->pagination_links = str_replace( 'page/1/\'', '\'', $bbp->topic_query->pagination_links );
+        $bbp->topic_query->pagination_links = str_replace( $wp_rewrite->pagination_base . "/1/'", "'", $bbp->topic_query->pagination_links );
     }
 
@@ -656 +659 @@
         // If pretty permalinks are enabled, make our pagination pretty
         if ( $wp_rewrite->using_permalinks() )
-            $base = user_trailingslashit( trailingslashit( get_permalink( $topic_id ) ) . 'page/%#%/' );
+            $base = trailingslashit( get_permalink( $topic_id ) ) . user_trailingslashit( $wp_rewrite->pagination_base . '/%#%/' );
         else
             $base = add_query_arg( 'paged', '%#%' );
@@ -684 +687 @@
             // Remove first page from pagination
             if ( $wp_rewrite->using_permalinks() )
-                $pagination_links = str_replace( 'page/1/',       '', $pagination_links );
+                $pagination_links = str_replace( $wp_rewrite->pagination_base . '/1/', '', $pagination_links );
             else
                 $pagination_links = str_replace( '&paged=1', '', $pagination_links );