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

Remove the trash warning on permalinks for now as the current implementation doesn't work very well. See #11863 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14462 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2010-05-05 07:37:51 +00:00
parent f1e2a3a5fa
commit 666ba09317
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/includes/post.php
View File

@ -1073,7 +1073,7 @@ function get_sample_permalink($id, $title = null, $name = null) {
function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
global $wpdb;
$post = &get_post($id);
$orig_permalink = sanitize_title($post->post_title);
list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
if ( 'publish' == $post->post_status ) {
@ -1116,18 +1116,6 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
}
}
if ( $orig_permalink != $post_name_abridged && !$post->post_name ) {
//check if post is trashed
$orig_ID = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_name = %s AND post_status='trash';",$orig_permalink));
if ( $orig_ID ) {
?>
<div id="message" class="error">
<?php echo sprintf( __('There was a permalink conflict with an item in the trash. <a href="$1%s">View Trash</a>'), 'edit.php?post_status=trash&amp;post_type='.$post->post_type ); ?>
</div>
<?php
}
}
$post_name_html = '<span id="editable-post-name" title="' . $title . '">' . $post_name_abridged . '</span>';
$display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
$view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);