Changeset 15848 for trunk/wp-includes/query.php

Timestamp:

10/19/2010 10:27:34 AM (14 years ago)

Author:

dd32

Message:

Limit wp_old_slug_redirect() to redirecting to only posts of the same post_type kind. See #15140

File:

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

trunk/wp-includes/query.php

@@ -3147 +3147 @@
         global $wpdb;
 
-        $query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND meta_key = '_wp_old_slug' AND meta_value=%s", $wp_query->query_vars['name']);
+        // Guess the current post_type based on the query vars.
+        if ( get_query_var('post_type') )
+            $post_type = get_query_var('post_type');
+        elseif ( !empty($wp_query->query_vars['pagename']) )
+            $post_type = 'page';
+        else
+            $post_type = 'post';
+
+        $query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, $wp_query->query_vars['name']);
 
         // if year, monthnum, or day have been specified, make our query more precise