WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use is_page_type_hierarchical(). props nacin. see #15140 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2010-12-08 21:17:01 +00:00
parent 218867ff3c
commit 298c858c5b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/post.php
View File

@ -4025,8 +4025,7 @@ function wp_check_for_changed_slugs($post_id, $post, $post_before) {
return; return;
// we're only concerned with published, non-hierarchical objects // we're only concerned with published, non-hierarchical objects
$ptype_obj = get_post_type_object( $post->post_type ); if ( $post->post_status != 'publish' || is_post_type_hierarchical( $post->post_type ) )
if ( $post->post_status != 'publish' || !$ptype_obj || $ptype_obj->hierarchical )
return; return;
$old_slugs = (array) get_post_meta($post_id, '_wp_old_slug'); $old_slugs = (array) get_post_meta($post_id, '_wp_old_slug');

3
wp-includes/query.php
View File

@ -3232,8 +3232,7 @@ function wp_old_slug_redirect() {
$post_type = 'post'; $post_type = 'post';
// Do not attempt redirect for hierarchical post types // Do not attempt redirect for hierarchical post types
$ptype_obj = get_post_type_object( $post_type ); if ( is_post_type_hierarchical( $post_type ) )
if ( !$ptype_obj || $ptype_obj->hierarchical )
return; return;
$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']); $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']);