Make WordPress Core

Ticket #36602: updated.36602.patch

File updated.36602.patch, 1.2 KB (added by cmillerdev, 9 years ago)

Alternate patch

  • wp-includes/canonical.php

    diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
    index 87afcce..4d12f7a 100644
    a b function redirect_canonical( $requested_url = null, $do_redirect = true ) { 
    254254                                }
    255255
    256256                        }
    257                 } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var( 'category_name' ) ) {
    258                         $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) ) )
    261                                 $redirect_url = get_permalink($wp_query->get_queried_object_id());
     257                } elseif ( is_single() && strpos( $wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var( 'category_name' ) ) {
     258                        $category = get_category_by_path( $cat, true, OBJECT );
     259                        if ( ( ! $category || is_wp_error( $category ) ) || ( ! has_term( $category->term_id, 'category', $wp_query->get_queried_object_id() ) ) ) {
     260                                $redirect_url = get_permalink( $wp_query->get_queried_object_id() );
     261                        }
    262262                }
    263263
    264264                // Post Paging