Changeset 19970 for trunk/wp-includes/canonical.php

Timestamp:

02/21/2012 07:00:06 PM (13 years ago)

Author:

duck_

Message:

Ensure that a category is part of the query before redirecting permalink structures containing %category%. Fixes #19241.

This fixes incorrect canonical redirects for singular queries using custom rewrite rules.

File:

• trunk/wp-includes/canonical.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -192 +192 @@
 
             }
-        } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) {
-            $category = get_category_by_path(get_query_var('category_name'));
+        } 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) ) )