From c8325e1ab5167aaae8d1a11cefa3a627710ecb7c Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Wed, 20 Apr 2016 15:35:27 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@37262


git-svn-id: http://core.svn.wordpress.org/trunk@37228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/canonical.php | 5 +++--
 wp-includes/version.php   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 87afcce2f7..b70a5f2a02 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -256,9 +256,10 @@ 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 = 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());
+			}
 		}
 
 		// Post Paging
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 769dd9c3a9..b8e2e82fda 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37261';
+$wp_version = '4.6-alpha-37262';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.