Changeset 30133

Timestamp:

11/01/2014 12:53:26 AM (12 years ago)

Author:

wonderboymusic

Message:

[28785] introduced a bug, where encoded query arguments were decoded by parse_str() inside of wp_parse_str() but never re-encoded later on.

This encodes them, adds unit test.

Props obenland.
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

@@ -2476 +2476 @@
         if ( isset( $url_parts[1] ) ) {
                 wp_parse_str( $url_parts[1], $query_args );
+                $query_args = urlencode_deep( $query_args );
         }
 

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

@@ -189 +189 @@
 
         function add_query_arg( $url ) {
-                return add_query_arg( array( 'foo' => 'bar' ), $url );
+                return add_query_arg( array(
+                        'foo' => 'bar',
+                        's'   => 'search+term',
+                ), $url );
         }
 
@@ -209 +212 @@
                 $document->preserveWhiteSpace = false;
 
-                // All links should have foo=bar arguments:
+                // All links should have foo=bar arguments and be escaped:
                 $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' ),
+                        0 => home_url( '/?foo=bar&s=search+term' ),
+                        1 => home_url( '/?foo=bar&s=search+term' ),
+                        3 => home_url( '/?paged=3&foo=bar&s=search+term' ),
+                        5 => home_url( '/?paged=5&foo=bar&s=search+term' ),
+                        6 => home_url( '/?paged=3&foo=bar&s=search+term' ),
                 );