Changeset 37262

Timestamp:

04/20/2016 03:34:15 PM (8 years ago)

Author:

boonebgorges

Message:

Canonical: Use get_the_terms() to verify that a post belongs to the requested %category%.

The get_the_terms() wrapper provides cache support, and saves a database hit
on sites with a persistent cache backend.

Props spacedmonkey.
Fixes #36602.

File:

• trunk/src/wp-includes/canonical.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 = wp_get_object_terms($wp_query->get_queried_object_id(), 'category', array('fields' => 'tt_ids'));
-            if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) && !empty($post_terms) && !in_array($category->term_taxonomy_id, $post_terms) ) )
+            $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 ) ) ) {
                 $redirect_url = get_permalink($wp_query->get_queried_object_id());
+            }
         }