Changeset 47169

Timestamp:

02/03/2020 12:12:22 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Canonical: When removing trailing punctuation from query string arguments, match the whole query var name.

Props daveslaughter.
Fixes #49347.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (1 diff)
• tests/phpunit/tests/canonical/noRewrite.php (modified) (2 diffs)

trunk/src/wp-includes/canonical.php

@@ -486 +486 @@
         if ( ! empty( $redirect['query'] ) ) {
                 // Remove trailing spaces and end punctuation from certain terminating query string args.
-                $redirect['query'] = preg_replace( "#((p|page_id|cat|tag)=[^&]*?)($punctuation_pattern)+$#", '$1', $redirect['query'] );
+                $redirect['query'] = preg_replace( "#((^|&)(p|page_id|cat|tag)=[^&]*?)($punctuation_pattern)+$#", '$1', $redirect['query'] );
 
                 // Clean up empty query strings.

trunk/tests/phpunit/tests/canonical/noRewrite.php

@@ -35 +35 @@
                  * [1]: Expected results: Any of the following can be used.
                  *      array( 'url': expected redirection location, 'qv': expected query vars to be set via the rewrite AND $_GET );
-                 *      array( expected query vars to be set, same as 'qv' above )
-                 *      (string) expected redirect location
-                 * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
+                 *      array( expected query vars to be set, same as 'qv' above );
+                 *      (string) expected redirect location.
+                 * [3]: (optional) The ticket the test refers to. Can be skipped if unknown.
                  */
                 return array(
@@ -268 +268 @@
                         array( '/page/2/%E2%80%9D', '/page/2/', 20383 ), // Encoded closing curly quote.
 
-                        array( '/?page_id=1', '/?p=1' ), // Redirect page_id to p (should cover page_id|p|attachment_id to one another.
+                        array( '/?page_id=1', '/?p=1' ), // Redirect page_id to p (should cover page_id|p|attachment_id to one another).
                         array( '/?page_id=1&post_type=revision', '/?p=1' ),
 
                         array( '/?feed=rss2&p=1', '/?feed=rss2&p=1', 21841 ),
                         array( '/?feed=rss&p=1', '/?feed=rss2&p=1', 24623 ),
+
+                        array( '/?comp=East+(North)', '/?comp=East+(North)', 49347 ),
                 );
         }