Skip to content

Fix infinite canonical redirect on pages with urlencoded slugs #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix infinite canonical redirect on pages with urlencoded slugs #956

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d41dec2
Prevent canonical redirect if the only difference between original an…
donmhico Jan 29, 2021
2c146d3
Fix WPCS
donmhico Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions src/wp-includes/canonical.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,27 +682,32 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
$redirect['host'] = $original['host'];
}

$compare_original = array( $original['host'], $original['path'] );

if ( ! empty( $original['port'] ) ) {
$compare_original[] = $original['port'];
}

if ( ! empty( $original['query'] ) ) {
$compare_original[] = $original['query'];
}
$build_redirect_url = false;
foreach ( $original as $k => $v ) {
if ( ! in_array( $k, array( 'host', 'path', 'port', 'query' ), true ) ) {
continue;
}

$compare_redirect = array( $redirect['host'], $redirect['path'] );
if ( isset( $redirect[ $k ] ) && $v === $redirect[ $k ] ) {
continue;
}

if ( ! empty( $redirect['port'] ) ) {
$compare_redirect[] = $redirect['port'];
}
/*
* Prevent redirect if the only difference between `$original` and `$redirect`
* is the 'query' part and if the urlencoded version of `$redirect['query']`
* is the same as `$original['query']`.
*/
if ( isset( $redirect['query'] ) && 'query' === $k ) {
$encoded_equals_query_original = str_replace( '=', '%3D', $original[ $k ] );
if ( strtolower( $encoded_equals_query_original ) === strtolower( urlencode( $redirect[ $k ] ) ) ) {
continue;
}
}

if ( ! empty( $redirect['query'] ) ) {
$compare_redirect[] = $redirect['query'];
$build_redirect_url = true;
}

if ( $compare_original !== $compare_redirect ) {
if ( $build_redirect_url ) {
$redirect_url = $redirect['scheme'] . '://' . $redirect['host'];

if ( ! empty( $redirect['port'] ) ) {
Expand Down