sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Props daveslaughter.
Fixes #49347.

git-svn-id: https://develop.svn.wordpress.org/trunk@47169 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-02-03 00:12:22 +00:00
parent 84f4d42cbb
commit dd48b7f757
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/canonical.php
View File

@ -485,7 +485,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
if ( ! empty( $redirect['query'] ) ) { if ( ! empty( $redirect['query'] ) ) {
// Remove trailing spaces and end punctuation from certain terminating query string args. // 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. // Clean up empty query strings.
$redirect['query'] = trim( preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query'] ), '&' ); $redirect['query'] = trim( preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query'] ), '&' );

10
tests/phpunit/tests/canonical/noRewrite.php
View File

@ -34,9 +34,9 @@ class Tests_Canonical_NoRewrite extends WP_Canonical_UnitTestCase {
* [0]: Test URL. * [0]: Test URL.
* [1]: Expected results: Any of the following can be used. * [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( '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 ) * array( expected query vars to be set, same as 'qv' above );
* (string) expected redirect location * (string) expected redirect location.
* [3]: (optional) The ticket the test refers to, Can be skipped if unknown. * [3]: (optional) The ticket the test refers to. Can be skipped if unknown.
*/ */
return array( return array(
array( '/?p=123', '/?p=123' ), array( '/?p=123', '/?p=123' ),
@ -267,11 +267,13 @@ class Tests_Canonical_NoRewrite extends WP_Canonical_UnitTestCase {
array( '/page/2/%E2%80%9C', '/page/2/', 20383 ), // Encoded opening curly quote. array( '/page/2/%E2%80%9C', '/page/2/', 20383 ), // Encoded opening curly quote.
array( '/page/2/%E2%80%9D', '/page/2/', 20383 ), // Encoded closing curly quote. 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( '/?page_id=1&post_type=revision', '/?p=1' ),
array( '/?feed=rss2&p=1', '/?feed=rss2&p=1', 21841 ), array( '/?feed=rss2&p=1', '/?feed=rss2&p=1', 21841 ),
array( '/?feed=rss&p=1', '/?feed=rss2&p=1', 24623 ), array( '/?feed=rss&p=1', '/?feed=rss2&p=1', 24623 ),
array( '/?comp=East+(North)', '/?comp=East+(North)', 49347 ),
); );
} }
} }