Make WordPress Core

Ticket #36602: 36602.patch

File 36602.patch, 1.0 KB (added by spacedmonkey, 9 years ago)
  • wp-includes/canonical.php

    diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
    index 87afcce..9287106 100644
    a b function redirect_canonical( $requested_url = null, $do_redirect = true ) { 
    256256                        }
    257257                } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var( 'category_name' ) ) {
    258258                        $category = get_category_by_path( $cat );
    259                         $post_terms = wp_get_object_terms($wp_query->get_queried_object_id(), 'category', array('fields' => 'tt_ids'));
    260                         if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) && !empty($post_terms) && !in_array($category->term_taxonomy_id, $post_terms) ) )
     259                        $post_terms = get_the_terms($wp_query->get_queried_object_id(), 'category');
     260                        if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) && !empty($post_terms) && !in_array($category, $post_terms) ) )
    261261                                $redirect_url = get_permalink($wp_query->get_queried_object_id());
    262262                }
    263263