Changeset 38216

Timestamp:

08/08/2016 06:48:53 PM (8 years ago)

Author:

boonebgorges

Message:

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.

Props cmillerdev.
Fixes #36602.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (1 diff)
• tests/phpunit/tests/canonical/category.php (modified) (1 diff)

trunk/src/wp-includes/canonical.php

@@ -257 +257 @@
         } 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());
             }

trunk/tests/phpunit/tests/canonical/category.php

@@ -63 +63 @@
             // Nonexistent category will redirect to correct one.
             array( '/foo/post0/', array( 'url' => '/cat0/post0/', 'qv' => array( 'category_name' => 'cat0', 'name' => 'post0', 'page' => '' ) ) ),
+
+            // Embed URLs should not redirect to post permalinks.
+            array( '/cat0/post0/embed/', array( 'url' => '/cat0/post0/embed/', 'qv' => array( 'category_name' => 'cat0', 'name' => 'post0', 'embed' => 'true' ) ) ),
         );
     }