Changeset 47169 for trunk/src/wp-includes/canonical.php

Timestamp:

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

Author:

SergeyBiryukov

Message:

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

Props daveslaughter.
Fixes #49347.

File:

• trunk/src/wp-includes/canonical.php (modified) (1 diff)

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.