Ticket #2702: 2702.2.diff

src/includes/replies/template.php

@@ -273 +273 @@
                         // Remove first page from pagination
                         if ( $wp_rewrite->using_permalinks() ) {
                                 $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 );
+                        } else{
+                                $bbp->reply_query->pagination_links = preg_replace_callback( '/&paged=1[^0-9]/', 
+                                        function( $matches ){
+                                                 return str_replace( '&paged=1', '', $matches[0] );        
+                                        },
+                                        $bbp->reply_query->pagination_links );
                         }
                 }
         }

src/includes/topics/template.php

@@ -914 +914 @@
                         if ( $wp_rewrite->using_permalinks() ) {
                                 $pagination_links = str_replace( $wp_rewrite->pagination_base . '/1/', '', $pagination_links );
                         } else {
-                                $pagination_links = str_replace( '&paged=1', '', $pagination_links );
+                                $pagination_links = preg_replace_callback( '/&paged=1[^0-9]/',
+                                        function( $matches ){
+                                                return str_replace( '&paged=1', '', $matches[0] );
+                                        },
+                                        $pagination_links );
                         }
 
                         // Add before and after to pagination links