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

Posts, Post Types: Use an existing string for "Invalid post type" error message. 

Props ramiy.
Fixes #39171.
Built from https://develop.svn.wordpress.org/trunk@39756


git-svn-id: http://core.svn.wordpress.org/trunk@39694 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2017-01-10 02:40:42 +00:00
parent fd0564d2bc
commit 9234febe06
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/async-upload.php
View File

@ -52,7 +52,7 @@ if ( ! current_user_can( 'upload_files' ) ) {
if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
$post = get_post( $id );
if ( 'attachment' != $post->post_type )
wp_die( __( 'Unknown post type.' ) );
wp_die( __( 'Invalid post type.' ) );
if ( ! current_user_can( 'edit_post', $id ) )
wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );

8
wp-admin/post.php
View File

@ -107,7 +107,7 @@ case 'edit':
wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
if ( ! $post_type_object )
wp_die( __( 'Unknown post type.' ) );
wp_die( __( 'Invalid post type.' ) );
if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
@ -208,7 +208,7 @@ case 'trash':
wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
if ( ! $post_type_object )
wp_die( __( 'Unknown post type.' ) );
wp_die( __( 'Invalid post type.' ) );
if ( ! current_user_can( 'delete_post', $post_id ) )
wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
@ -231,7 +231,7 @@ case 'untrash':
wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
if ( ! $post_type_object )
wp_die( __( 'Unknown post type.' ) );
wp_die( __( 'Invalid post type.' ) );
if ( ! current_user_can( 'delete_post', $post_id ) )
wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
@ -249,7 +249,7 @@ case 'delete':
wp_die( __( 'This item has already been deleted.' ) );
if ( ! $post_type_object )
wp_die( __( 'Unknown post type.' ) );
wp_die( __( 'Invalid post type.' ) );
if ( ! current_user_can( 'delete_post', $post_id ) )
wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );

2
wp-includes/class-wp-customize-nav-menus.php
View File

@ -787,7 +787,7 @@ final class WP_Customize_Nav_Menus {
*/
public function insert_auto_draft_post( $postarr ) {
if ( ! isset( $postarr['post_type'] ) || ! post_type_exists( $postarr['post_type'] ) ) {
return new WP_Error( 'unknown_post_type', __( 'Unknown post type' ) );
return new WP_Error( 'unknown_post_type', __( 'Invalid post type.' ) );
}
if ( empty( $postarr['post_title'] ) ) {
return new WP_Error( 'empty_title', __( 'Empty title' ) );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.8-alpha-39755';
$wp_version = '4.8-alpha-39756';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.