Ticket #2702: 2702.4.diff

src/includes/common/formatting.php

@@ -389 +389 @@
         $r = preg_replace( '#(<a( [^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
         return $r;
 }
+
+/**
+ * Removes the first page query string &paged=1
+ *
+ * @since
+ *
+ * @return string The query string for the first page
+ */
+function bbp_pagination_paged_1_replace( $matches ){
+        return str_replace( '&#038;paged=1', '', $matches[0] );
+}

src/includes/replies/template.php

@@ -273 +273 @@
                         if ( bbp_use_pretty_urls() ) {
                                 $bbp->reply_query->pagination_links = str_replace( bbp_get_paged_slug() . '/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 = preg_replace_callback( '/&paged=1[^0-9]/',
+                                        'bbp_pagination_paged_1_replace',
+                                $bbp->reply_query->pagination_links );
                         }
                 }
         }

src/includes/topics/template.php

@@ -908 +908 @@
                         if ( bbp_use_pretty_urls() ) {
                                 $pagination_links = str_replace( bbp_get_paged_slug() . '/1/', '', $pagination_links );
                         } else {
-                                $pagination_links = str_replace( '&paged=1', '', $pagination_links );
+                                $pagination_links = preg_replace_callback( '/&paged=1[^0-9]/',
+                                        'bbp_pagination_paged_1_replace',
+                                $pagination_links );
                         }
 
                         // Add before and after to pagination links

tests/phpunit/testcases/replies/template/loop.php

@@ -21 +21 @@
         }
 
         /**
+     * @ticket BBP2702
+     */
+        public function test_replies_pagination_when_pages_are_greater_than_nine() {
+
+                $bbp = bbpress();
+
+                if ( is_multisite() ) {
+                        $this->markTestSkipped( 'Skipping URL tests in multiste for now.' );
+                }
+
+                $f = $this->factory->forum->create();
+                $t = $this->factory->topic->create( array(
+                        'post_parent' => $f,
+                        'topic_meta' => array(
+                                'forum_id' => $f,
+                        ),
+                ) );
+
+                $r = $this->factory->reply->create_many( 15, array(
+                        'post_parent' => $t,
+                        'reply_meta' => array(
+                                'forum_id' => $f,
+                                'topic_id' => $t,
+                        ),
+                ) );
+
+                // Default query args from bbp_has_replies are going to be used as the args
+                $args = array(
+                        'posts_per_page' => 1,          // use 1 per page for testing
+                );
+
+                $request_uri = $_SERVER['REQUEST_URI'];
+            $_SERVER['REQUEST_URI'] = add_query_arg( 'topic=' . $t, '', $request_uri );
+
+            // test unpretty permalinks (default)
+                bbp_has_replies( $args );
+
+                $paged_link = $_SERVER['REQUEST_URI'] . '&paged=';
+                $page2 = $paged_link . '2';
+                $page16 = $paged_link . '16';
+
+                $expected =<<<EXPECTED
+<span class='page-numbers current'>1</span>
+<a class='page-numbers' href='$page2'>2</a>
+<span class="page-numbers dots">&hellip;</span>
+<a class='page-numbers' href='$page16'>16</a>
+<a class="next page-numbers" href="$page2">&rarr;</a>
+EXPECTED;
+
+                $links = bbp_get_topic_pagination_links();
+                $this->assertEquals( $expected, $links );
+
+                $_SERVER['REQUEST_URI'] = $request_uri;
+
+        }
+
+
+        /**
          * @covers ::bbp_replies
          * @todo   Implement test_bbp_replies().
          */

tests/phpunit/testcases/topics/template/loop.php

@@ -21 +21 @@
         }
 
         /**
+     * @ticket BBP2702
+     */
+        public function test_topics_pagination_when_pages_are_greater_than_nine() {
+
+                $bbp = bbpress();
+
+                if ( is_multisite() ) {
+                        $this->markTestSkipped( 'Skipping URL tests in multiste for now.' );
+                }
+
+                $f = $this->factory->forum->create();
+                $t = $this->factory->topic->create_many( 15, array(
+                        'post_parent' => $f,
+                        'topic_meta' => array(
+                                'forum_id' => $f,
+                        ),
+                ) );
+
+                // Default query args from bbp_has_replies are going to be used as the args
+                $args = array(
+                        'posts_per_page' => 1,          // use 1 per page for testing
+                );
+
+                $request_uri = $_SERVER['REQUEST_URI'];
+            $_SERVER['REQUEST_URI'] = add_query_arg( 'forum=' . $f, '', $request_uri );
+
+            // test unpretty permalinks (default)
+                bbp_has_replies( $args );
+
+                $paged_link = $_SERVER['REQUEST_URI'] . '&paged=';
+                $page2 = $paged_link . '2';
+                $page15 = $paged_link . '15';
+
+                $expected =<<<EXPECTED
+<span class='page-numbers current'>1</span>
+<a class='page-numbers' href='$page2'>2</a>
+<span class="page-numbers dots">&hellip;</span>
+<a class='page-numbers' href='$page15'>15</a>
+<a class="next page-numbers" href="$page2">&rarr;</a>
+EXPECTED;
+
+                $links = bbp_get_topic_pagination_links();
+                $this->assertEquals( $expected, $links );
+
+                $_SERVER['REQUEST_URI'] = $request_uri;
+
+        }
+
+        /**
          * @covers ::bbp_topics
          * @todo   Implement test_bbp_topics().
          */