Changeset 47922

Timestamp:

06/07/2020 09:22:07 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Posts, Post Types: Display a more specific error message when an attachment could not be inserted into the database.

Props shital-patel, Presskopp, ocean90.
Fixes #50325.

Location:

trunk/src

Files:

• wp-admin/includes/bookmark.php (modified) (2 diffs)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/post.php (modified) (15 diffs)

trunk/src/wp-admin/includes/bookmark.php

@@ -206 +206 @@
         if ( false === $wpdb->update( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ), compact( 'link_id' ) ) ) {
             if ( $wp_error ) {
-                return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );
+                return new WP_Error( 'db_update_error', __( 'Could not update link in the database.' ), $wpdb->last_error );
             } else {
                 return 0;
@@ -214 +214 @@
         if ( false === $wpdb->insert( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ) ) ) {
             if ( $wp_error ) {
-                return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );
+                return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database.' ), $wpdb->last_error );
             } else {
                 return 0;

trunk/src/wp-includes/comment.php

@@ -2306 +2306 @@
     if ( ! $wpdb->update( $wpdb->comments, array( 'comment_approved' => $status ), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
         if ( $wp_error ) {
-            return new WP_Error( 'db_update_error', __( 'Could not update comment status' ), $wpdb->last_error );
+            return new WP_Error( 'db_update_error', __( 'Could not update comment status.' ), $wpdb->last_error );
         } else {
             return false;

trunk/src/wp-includes/post.php

@@ -3644 +3644 @@
         $post_ID     = $postarr['ID'];
         $post_before = get_post( $post_ID );
+
         if ( is_null( $post_before ) ) {
             if ( $wp_error ) {
@@ -3662 +3663 @@
     $post_content = $postarr['post_content'];
     $post_excerpt = $postarr['post_excerpt'];
+
     if ( isset( $postarr['post_name'] ) ) {
         $post_name = $postarr['post_name'];
@@ -3700 +3702 @@
 
     $post_status = empty( $postarr['post_status'] ) ? 'draft' : $postarr['post_status'];
+
     if ( 'attachment' === $post_type && ! in_array( $post_status, array( 'inherit', 'private', 'trash', 'auto-draft' ), true ) ) {
         $post_status = 'inherit';
@@ -3745 +3748 @@
         // On updates, we need to check to see if it's using the old, fixed sanitization context.
         $check_name = sanitize_title( $post_name, '', 'old-save' );
+
         if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $post_ID ) == $check_name ) {
             $post_name = $check_name;
@@ -3876 +3880 @@
     if ( 'trash' === $previous_status && 'trash' !== $post_status ) {
         $desired_post_slug = get_post_meta( $post_ID, '_wp_desired_post_slug', true );
+
         if ( $desired_post_slug ) {
             delete_post_meta( $post_ID, '_wp_desired_post_slug' );
@@ -3918 +3923 @@
         if ( isset( $data[ $emoji_field ] ) ) {
             $charset = $wpdb->get_col_charset( $wpdb->posts, $emoji_field );
+
             if ( 'utf8' === $charset ) {
                 $data[ $emoji_field ] = wp_encode_emoji( $data[ $emoji_field ] );
@@ -3951 +3957 @@
         $data = apply_filters( 'wp_insert_post_data', $data, $postarr, $unsanitized_postarr );
     }
+
     $data  = wp_unslash( $data );
     $where = array( 'ID' => $post_ID );
@@ -3964 +3971 @@
          */
         do_action( 'pre_post_update', $post_ID, $data );
+
         if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) {
             if ( $wp_error ) {
-                return new WP_Error( 'db_update_error', __( 'Could not update post in the database' ), $wpdb->last_error );
+                if ( 'attachment' === $post_type ) {
+                    $message = __( 'Could not update attachment in the database.' );
+                } else {
+                    $message = __( 'Could not update post in the database.' );
+                }
+
+                return new WP_Error( 'db_update_error', $message, $wpdb->last_error );
             } else {
                 return 0;
@@ -3975 +3989 @@
         if ( ! empty( $import_id ) ) {
             $import_id = (int) $import_id;
+
             if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id ) ) ) {
                 $data['ID'] = $import_id;
             }
         }
+
         if ( false === $wpdb->insert( $wpdb->posts, $data ) ) {
             if ( $wp_error ) {
-                return new WP_Error( 'db_insert_error', __( 'Could not insert post into the database' ), $wpdb->last_error );
+                if ( 'attachment' === $post_type ) {
+                    $message = __( 'Could not insert attachment into the database.' );
+                } else {
+                    $message = __( 'Could not insert post into the database.' );
+                }
+
+                return new WP_Error( 'db_insert_error', $message, $wpdb->last_error );
             } else {
                 return 0;
             }
         }
+
         $post_ID = (int) $wpdb->insert_id;
 
@@ -3994 +4017 @@
     if ( empty( $data['post_name'] ) && ! in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ), true ) ) {
         $data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'], $post_ID ), $post_ID, $data['post_status'], $post_type, $post_parent );
+
         $wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where );
         clean_post_cache( $post_ID );
@@ -4010 +4034 @@
         foreach ( $postarr['tax_input'] as $taxonomy => $tags ) {
             $taxonomy_obj = get_taxonomy( $taxonomy );
+
             if ( ! $taxonomy_obj ) {
                 /* translators: %s: Taxonomy name. */
@@ -4020 +4045 @@
                 $tags = array_filter( $tags );
             }
+
             if ( current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
                 wp_set_post_terms( $post_ID, $tags, $taxonomy );
@@ -4052 +4078 @@
     if ( isset( $postarr['_thumbnail_id'] ) ) {
         $thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) || 'revision' === $post_type;
+
         if ( ! $thumbnail_support && 'attachment' === $post_type && $post_mime_type ) {
             if ( wp_attachment_is( 'audio', $post_ID ) ) {
@@ -4077 +4104 @@
         $post->page_template = $postarr['page_template'];
         $page_templates      = wp_get_theme()->get_page_templates( $post );
+
         if ( 'default' !== $postarr['page_template'] && ! isset( $page_templates[ $postarr['page_template'] ] ) ) {
             if ( $wp_error ) {
                 return new WP_Error( 'invalid_page_template', __( 'Invalid page template.' ) );
             }
+
             update_post_meta( $post_ID, '_wp_page_template', 'default' );
         } else {
@@ -4099 +4128 @@
              */
             do_action( 'edit_attachment', $post_ID );
+
             $post_after = get_post( $post_ID );