From 4de0d4779246a3fe623b45c9b193a4ec10381eb8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 11 Jun 2020 10:55:11 +0000
Subject: [PATCH] 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
---
 wp-includes/canonical.php | 11 -----------
 wp-includes/version.php   |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index b73b9f72f2..42d6dcf44a 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -409,17 +409,6 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			}
 
 			$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.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index fc5a1d86d0..919ad146ee 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @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.