diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index 4a873aa310..7d783afda6 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -179,8 +179,8 @@ switch ( $post->post_status ) {
ID) ) { ?> -ID", 'delete-post_' . $post->ID); ?>" onclick="if ( confirm('post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"> +if ( ( 'edit' == $action ) && current_user_can('delete_page', $post->ID) ) { ?> +ID", 'delete-page_' . $post->ID); ?>" onclick="if ( confirm('post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;">
diff --git a/wp-admin/page.php b/wp-admin/page.php index 6d943de897..8258356052 100644 --- a/wp-admin/page.php +++ b/wp-admin/page.php @@ -166,7 +166,7 @@ case 'delete': } $sendback = wp_get_referer(); - if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page.php'); + if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php'); elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); wp_redirect($sendback);