Revert [11202], see #9726
git-svn-id: http://svn.automattic.com/wordpress/trunk@11461 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
01635abdb9
commit
93895989c8
|
@ -2452,7 +2452,19 @@ function wp_insert_attachment($object, $file = false, $parent = 0) {
|
||||||
else
|
else
|
||||||
$post_name = sanitize_title($post_name);
|
$post_name = sanitize_title($post_name);
|
||||||
|
|
||||||
$post_name = wp_unique_post_slug($post_name, $post_ID, $post_status, $post_type, $post_parent);
|
// expected_slashed ($post_name)
|
||||||
|
$post_name_check = $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_status = 'inherit' AND ID != %d LIMIT 1", $post_name, $post_ID ) );
|
||||||
|
|
||||||
|
if ( $post_name_check ) {
|
||||||
|
$suffix = 2;
|
||||||
|
while ( $post_name_check ) {
|
||||||
|
$alt_post_name = $post_name . "-$suffix";
|
||||||
|
// expected_slashed ($alt_post_name, $post_name)
|
||||||
|
$post_name_check = $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_status = 'inherit' AND ID != %d LIMIT 1", $alt_post_name, $post_ID ) );
|
||||||
|
$suffix++;
|
||||||
|
}
|
||||||
|
$post_name = $alt_post_name;
|
||||||
|
}
|
||||||
|
|
||||||
if ( empty($post_date) )
|
if ( empty($post_date) )
|
||||||
$post_date = current_time('mysql');
|
$post_date = current_time('mysql');
|
||||||
|
@ -3764,4 +3776,4 @@ function _show_post_preview() {
|
||||||
|
|
||||||
add_filter('the_preview', '_set_preview');
|
add_filter('the_preview', '_set_preview');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue