From 14fa6a89ca3dcea03ec7ef6f56666e288daeb5fb Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Tue, 9 Aug 2016 00:13:31 +0000 Subject: [PATCH] Improve category check in `redirect_canonical()` when permastruct contains category slug. [37262] changed a check in `redirect_canonical()` so that it checked categories in the object cache rather than querying the database. However, the check was based on the identity of `WP_Term` objects, which in certain cases can be augmented by the main WP query routine, causing failures of the `in_array()` check. This caused unnecessary redirects for URLs where `is_single()` is true, but the URL is different from the post permalink, such as the `embed` endpoint. `has_term()` also checks the cache, but does not sufer from this bug. Merges [38216] to the 4.6 branch. Props cmillerdev. Fixes #36602. Built from https://develop.svn.wordpress.org/branches/4.6@38220 git-svn-id: http://core.svn.wordpress.org/branches/4.6@38161 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/canonical.php | 3 +-- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 387b9f2383..11c513d31a 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -256,8 +256,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var( 'category_name' ) ) { $category = get_category_by_path( $cat ); - $post_terms = get_the_terms( $wp_query->get_queried_object_id(), 'category' ); - if ( ( ! $category || is_wp_error( $category ) ) || ( ! is_wp_error( $post_terms ) && ! empty( $post_terms ) && ! in_array( $category, $post_terms ) ) ) { + if ( ( ! $category || is_wp_error( $category ) ) || ! has_term( $category->term_id, 'category', $wp_query->get_queried_object_id() ) ) { $redirect_url = get_permalink($wp_query->get_queried_object_id()); } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 79ae65742f..3238989853 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-RC1-38219'; +$wp_version = '4.6-RC1-38220'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.