WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Canonical: Revert [47937] pending unit tests and further review. 

Props needle.
See #12456.
Built from https://develop.svn.wordpress.org/trunk@48026


git-svn-id: http://core.svn.wordpress.org/trunk@47794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-06-11 10:55:11 +00:00
parent c075eec24f
commit 4de0d47792
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/canonical.php
View File

@ -409,17 +409,6 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
} }
$redirect['query'] = remove_query_arg( 'page', $redirect['query'] ); $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
} elseif ( is_singular() && empty( get_query_var( 'name' ) ) && $post_id ) {
/*
* Redirect example.org/%post_id%/ to canonical url.
* @ticket 12456
*/
$redirect_url = get_permalink( $post_id );
$redirect['query'] = _remove_qs_args_if_not_in_url(
$redirect['query'],
array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ),
$redirect_url
);
} }
// Paging and feeds. // Paging and feeds.

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-alpha-47984'; $wp_version = '5.5-alpha-48026';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.