Changeset 29780

Timestamp:

09/29/2014 04:02:23 AM (12 years ago)

Author:

wonderboymusic

Message:

In paginate_links(), ensure that query string args are propagated to the resulting paginated links.

Adds unit tests that use DOMDocument since assertTag is being deprecated - see #29545, [29746].

Props obenland, wonderboymusic.
Fixes #29636.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (1 diff)
• tests/phpunit/tests/general/paginateLinks.php (modified) (2 diffs)

trunk/src/wp-includes/general-template.php

@@ -2486 +2486 @@
                 'mid_size' => 2,
                 'type' => 'plain',
-                'add_args' => false, // array of query args to add
+                'add_args' => $query_args, // array of query args to add
                 'add_fragment' => '',
                 'before_page_number' => '',

trunk/tests/phpunit/tests/general/paginateLinks.php

@@ -127 +127 @@
                 $expected_attributes = array(
                         array(
-                                'href'  => 'http://' . WP_TESTS_DOMAIN . '/',
+                                'href'  => home_url( '/' ),
                                 'class' => 'prev page-numbers'
                         ),
                         array(
-                                'href'  => 'http://' . WP_TESTS_DOMAIN . '/',
+                                'href'  => home_url( '/' ),
                                 'class' => 'page-numbers'
                         )
@@ -178 +178 @@
         }
 
+        function add_query_arg( $url ) {
+                return add_query_arg( array( 'foo' => 'bar' ), $url );
+        }
+
+        /**
+         * @ticket 29636
+         */
+        function test_paginate_links_query_args() {
+                add_filter( 'get_pagenum_link', array( $this, 'add_query_arg' ) );
+                $links = paginate_links( array(
+                        'current'  => 2,
+                        'total'    => 5,
+                        'end_size' => 1,
+                        'mid_size' => 1,
+                        'type'     => 'array',
+                ) );
+                remove_filter( 'get_pagenum_link', array( $this, 'add_query_arg' ) );
+
+                $document = new DOMDocument();
+                $document->preserveWhiteSpace = false;
+
+                // All links should have foo=bar arguments:
+                $data = array(
+                        0 => home_url( '/?foo=bar' ),
+                        1 => home_url( '/?foo=bar' ),
+                        3 => home_url( '/?paged=3&foo=bar' ),
+                        5 => home_url( '/?paged=5&foo=bar' ),
+                        6 => home_url( '/?paged=3&foo=bar' ),
+                );
+
+                foreach ( $data as $index => $expected_href ) {
+                        $document->loadHTML( $links[ $index ] );
+                        $tag = $document->getElementsByTagName( 'a' )->item( 0 );
+                        $this->assertNotNull( $tag );
+
+                        $href = $tag->attributes->getNamedItem( 'href' )->value;
+                        $this->assertEquals( $expected_href, $href );
+                }
+        }
 }