WordPress 4.4.1

[autoinstalls/wordpress.git] / wp-includes / query.php

diff --git a/wp-includes/query.php b/wp-includes/query.php
index a2b236540e9e86410fcb2e487b3093e2ea154b3c..9460d32450ba9cb0d2addf1105df4413da0f6058 100644 (file)
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -4986,6 +4986,10 @@ class WP_Query {
 function wp_old_slug_redirect() {
        global $wp_query, $wp_rewrite;
 
+       if ( get_queried_object() ) {
+               return;
+       }
+
        if ( '' !== $wp_query->query_vars['name'] ) :
                global $wpdb;