From d2fc1773ae0bc446aae8452dce1115d7e2d0dd86 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 23 Jun 2014 13:15:16 +0000 Subject: [PATCH] Prevent multiple hierarchical posts with the same slug from being displayed in single post template. fixes #28611. Built from https://develop.svn.wordpress.org/trunk@28803 git-svn-id: http://core.svn.wordpress.org/trunk@28612 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/query.php | 6 +++--- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/query.php b/wp-includes/query.php index 7199c9c503..c2421cd369 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -2372,11 +2372,11 @@ class WP_Query { if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) ) continue; - if ( ! $ptype_obj->hierarchical || strpos($q[ $ptype_obj->query_var ], '/') === false ) { - // Non-hierarchical post_types & parent-level-hierarchical post_types can directly use 'name' + if ( ! $ptype_obj->hierarchical ) { + // Non-hierarchical post types can directly use 'name'. $q['name'] = $q[ $ptype_obj->query_var ]; } else { - // Hierarchical post_types will operate through the + // Hierarchical post types will operate through 'pagename'. $q['pagename'] = $q[ $ptype_obj->query_var ]; $q['name'] = ''; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 6afbda651d..0f3702d995 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.0-alpha-20140622'; +$wp_version = '4.0-alpha-20140623'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.