WordPress 4.7

[autoinstalls/wordpress.git] / wp-admin / includes / post.php

diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index fa3e400e3c174949763b7a974d191b4837c318f1..ab50c27d941a269f49bf7c4e817497292609ca50 100644 (file)
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -30,14 +30,14 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
 
        if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
                if ( 'page' == $post_data['post_type'] )
 
        if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
                if ( 'page' == $post_data['post_type'] )

-                       return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+                       return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );

                else
                else

-                       return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+                       return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );

        } elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
                if ( 'page' == $post_data['post_type'] )
        } elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
                if ( 'page' == $post_data['post_type'] )

-                       return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+                       return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );

                else
                else

-                       return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+                       return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );

        }
 
        if ( isset( $post_data['content'] ) )
        }
 
        if ( isset( $post_data['content'] ) )


@@ -68,14 +68,14 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
                 && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
                if ( $update ) {
                        if ( 'page' == $post_data['post_type'] )
                 && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
                if ( $update ) {
                        if ( 'page' == $post_data['post_type'] )

-                               return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+                               return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );

                        else
                        else

-                               return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+                               return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );

                } else {
                        if ( 'page' == $post_data['post_type'] )
                } else {
                        if ( 'page' == $post_data['post_type'] )

-                               return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+                               return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );

                        else
                        else

-                               return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+                               return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );

                }
        }
 
                }
        }
 


@@ -160,11 +160,18 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
                $post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
                $valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
                if ( !$valid_date ) {
                $post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
                $valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
                if ( !$valid_date ) {

-                       return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+                       return new WP_Error( 'invalid_date', __( 'Invalid date.' ) );

                }
                $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
        }
 
                }
                $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
        }
 

+       if ( isset( $post_data['post_category'] ) ) {
+               $category_object = get_taxonomy( 'category' );
+               if ( ! current_user_can( $category_object->cap->assign_terms ) ) {
+                       unset( $post_data['post_category'] );
+               }
+       }
+

        return $post_data;
 }
 
        return $post_data;
 }
 


@@ -203,9 +210,9 @@ function edit_post( $post_data = null ) {
        $ptype = get_post_type_object($post_data['post_type']);
        if ( !current_user_can( 'edit_post', $post_ID ) ) {
                if ( 'page' == $post_data['post_type'] )
        $ptype = get_post_type_object($post_data['post_type']);
        if ( !current_user_can( 'edit_post', $post_ID ) ) {
                if ( 'page' == $post_data['post_type'] )

-                       wp_die( __('You are not allowed to edit this page.' ));
+                       wp_die( __('Sorry, you are not allowed to edit this page.' ));

                else
                else

-                       wp_die( __('You are not allowed to edit this post.' ));
+                       wp_die( __('Sorry, you are not allowed to edit this post.' ));

        }
 
        if ( post_type_supports( $ptype->name, 'revisions' ) ) {
        }
 
        if ( post_type_supports( $ptype->name, 'revisions' ) ) {


@@ -281,6 +288,8 @@ function edit_post( $post_data = null ) {
                                continue;
                        if ( $meta->post_id != $post_ID )
                                continue;
                                continue;
                        if ( $meta->post_id != $post_ID )
                                continue;

+                       if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $meta->meta_key ) )
+                               continue;

                        if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
                                continue;
                        update_meta( $key, $value['key'], $value['value'] );
                        if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
                                continue;
                        update_meta( $key, $value['key'], $value['value'] );


@@ -421,9 +430,9 @@ function bulk_edit_posts( $post_data = null ) {
 
        if ( !current_user_can( $ptype->cap->edit_posts ) ) {
                if ( 'page' == $ptype->name )
 
        if ( !current_user_can( $ptype->cap->edit_posts ) ) {
                if ( 'page' == $ptype->name )

-                       wp_die( __('You are not allowed to edit pages.'));
+                       wp_die( __('Sorry, you are not allowed to edit pages.'));

                else
                else

-                       wp_die( __('You are not allowed to edit posts.'));
+                       wp_die( __('Sorry, you are not allowed to edit posts.'));

        }
 
        if ( -1 == $post_data['_status'] ) {
        }
 
        if ( -1 == $post_data['_status'] ) {


@@ -622,7 +631,7 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
        }
 
        /**
        }
 
        /**

-        * Filter the default post content initially used in the "Write Post" form.
+        * Filters the default post content initially used in the "Write Post" form.

         *
         * @since 1.5.0
         *
         *
         * @since 1.5.0
         *


@@ -632,7 +641,7 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
        $post->post_content = apply_filters( 'default_content', $post_content, $post );
 
        /**
        $post->post_content = apply_filters( 'default_content', $post_content, $post );
 
        /**

-        * Filter the default post title initially used in the "Write Post" form.
+        * Filters the default post title initially used in the "Write Post" form.

         *
         * @since 1.5.0
         *
         *
         * @since 1.5.0
         *


@@ -642,7 +651,7 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
        $post->post_title = apply_filters( 'default_title', $post_title, $post );
 
        /**
        $post->post_title = apply_filters( 'default_title', $post_title, $post );
 
        /**

-        * Filter the default post excerpt initially used in the "Write Post" form.
+        * Filters the default post excerpt initially used in the "Write Post" form.

         *
         * @since 1.5.0
         *
         *
         * @since 1.5.0
         *


@@ -687,7 +696,7 @@ function post_exists($title, $content = '', $date = '') {
        }
 
        if ( !empty ( $content ) ) {
        }
 
        if ( !empty ( $content ) ) {

-               $query .= 'AND post_content = %s';
+               $query .= ' AND post_content = %s';

                $args[] = $post_content;
        }
 
                $args[] = $post_content;
        }
 


@@ -714,9 +723,9 @@ function wp_write_post() {
 
        if ( !current_user_can( $ptype->cap->edit_posts ) ) {
                if ( 'page' == $ptype->name )
 
        if ( !current_user_can( $ptype->cap->edit_posts ) ) {
                if ( 'page' == $ptype->name )

-                       return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
+                       return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );

                else
                else

-                       return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+                       return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );

        }
 
        $_POST['post_mime_type'] = '';
        }
 
        $_POST['post_mime_type'] = '';


@@ -1022,7 +1031,7 @@ function wp_edit_posts_query( $q = false ) {
                $posts_per_page = 20;
 
        /**
                $posts_per_page = 20;
 
        /**

-        * Filter the number of items per page to show for a specific 'per_page' type.
+        * Filters the number of items per page to show for a specific 'per_page' type.

         *
         * The dynamic portion of the hook name, `$post_type`, refers to the post type.
         *
         *
         * The dynamic portion of the hook name, `$post_type`, refers to the post type.
         *


@@ -1037,7 +1046,7 @@ function wp_edit_posts_query( $q = false ) {
        $posts_per_page = apply_filters( "edit_{$post_type}_per_page", $posts_per_page );
 
        /**
        $posts_per_page = apply_filters( "edit_{$post_type}_per_page", $posts_per_page );
 
        /**

-        * Filter the number of posts displayed per page when specifically listing "posts".
+        * Filters the number of posts displayed per page when specifically listing "posts".

         *
         * @since 2.8.0
         *
         *
         * @since 2.8.0
         *


@@ -1113,7 +1122,7 @@ function wp_edit_attachments_query_vars( $q = false ) {
        }
 
        /**
        }
 
        /**

-        * Filter the number of items to list per page when listing media items.
+        * Filters the number of items to list per page when listing media items.

         *
         * @since 2.9.0
         *
         *
         * @since 2.9.0
         *


@@ -1137,9 +1146,43 @@ function wp_edit_attachments_query_vars( $q = false ) {
                $q['post_parent'] = 0;
        }
 
                $q['post_parent'] = 0;
        }
 

+       // Filter query clauses to include filenames.
+       if ( isset( $q['s'] ) ) {
+               add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+       }
+

        return $q;
 }
 
        return $q;
 }
 

+/**
+ * Filter the SQL clauses of an attachment query to include filenames.
+ *
+ * @since 4.7.0
+ * @access private
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param array $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
+ *                       DISTINCT, fields (SELECT), and LIMITS clauses.
+ * @return array The modified clauses.
+ */
+function _filter_query_attachment_filenames( $clauses ) {
+       global $wpdb;
+       remove_filter( 'posts_clauses', __FUNCTION__ );
+
+       // Add a LEFT JOIN of the postmeta table so we don't trample existing JOINs.
+       $clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
+
+       $clauses['groupby'] = "{$wpdb->posts}.ID";
+
+       $clauses['where'] = preg_replace(
+               "/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/",
+               "$0 OR ( sq1.meta_value $1 $2 )",
+               $clauses['where'] );
+
+       return $clauses;
+}
+

 /**
  * Executes a query for attachments. An array of WP_Query arguments
  * can be passed in, which will override the arguments set by this function.
 /**
  * Executes a query for attachments. An array of WP_Query arguments
  * can be passed in, which will override the arguments set by this function.


@@ -1159,7 +1202,7 @@ function wp_edit_attachments_query( $q = false ) {
 }
 
 /**
 }
 
 /**

- * Returns the list of classes to be used by a metabox
+ * Returns the list of classes to be used by a meta box.

  *
  * @since 2.5.0
  *
  *
  * @since 2.5.0
  *


@@ -1181,7 +1224,7 @@ function postbox_classes( $id, $page ) {
        }
 
        /**
        }
 
        /**

-        * Filter the postbox classes for a specific screen and screen ID combo.
+        * Filters the postbox classes for a specific screen and screen ID combo.

         *
         * The dynamic portions of the hook name, `$page` and `$id`, refer to
         * the screen and screen ID, respectively.
         *
         * The dynamic portions of the hook name, `$page` and `$id`, refer to
         * the screen and screen ID, respectively.


@@ -1200,9 +1243,9 @@ function postbox_classes( $id, $page ) {
  * @since 2.5.0
  *
  * @param int    $id    Post ID or post object.
  * @since 2.5.0
  *
  * @param int    $id    Post ID or post object.

- * @param string $title Optional. Title. Default null.
- * @param string $name  Optional. Name. Default null.
- * @return array Array with two entries of type string.
+ * @param string $title Optional. Title to override the post's current title when generating the post name. Default null.
+ * @param string $name  Optional. Name to override the post name. Default null.
+ * @return array Array containing the sample permalink with placeholder for the post name, and the post name.

  */
 function get_sample_permalink($id, $title = null, $name = null) {
        $post = get_post( $id );
  */
 function get_sample_permalink($id, $title = null, $name = null) {
        $post = get_post( $id );


@@ -1259,11 +1302,11 @@ function get_sample_permalink($id, $title = null, $name = null) {
        unset($post->filter);
 
        /**
        unset($post->filter);
 
        /**

-        * Filter the sample permalink.
+        * Filters the sample permalink.

         *
         * @since 4.4.0
         *
         *
         * @since 4.4.0
         *

-        * @param string  $permalink Sample permalink.
+        * @param array   $permalink Array containing the sample permalink with placeholder for the post name, and the post name.

         * @param int     $post_id   Post ID.
         * @param string  $title     Post title.
         * @param string  $name      Post name (slug).
         * @param int     $post_id   Post ID.
         * @param string  $title     Post title.
         * @param string  $name      Post name (slug).


@@ -1293,16 +1336,15 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
        $preview_target = '';
 
        if ( current_user_can( 'read_post', $post->ID ) ) {
        $preview_target = '';
 
        if ( current_user_can( 'read_post', $post->ID ) ) {

-               if ( 'draft' === $post->post_status ) {
-                       $draft_link = set_url_scheme( get_permalink( $post->ID ) );
-                       $view_link = get_preview_post_link( $post, array(), $draft_link );
+               if ( 'draft' === $post->post_status || empty( $post->post_name ) ) {
+                       $view_link = get_preview_post_link( $post );

                        $preview_target = " target='wp-preview-{$post->ID}'";
                } else {
                        if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
                                $view_link = get_permalink( $post );
                        } else {
                        $preview_target = " target='wp-preview-{$post->ID}'";
                } else {
                        if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
                                $view_link = get_permalink( $post );
                        } else {

-                               // Allow non-published (private, future) to be viewed at a pretty permalink.
-                               $view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, urldecode( $permalink ) );
+                               // Allow non-published (private, future) to be viewed at a pretty permalink, in case $post->post_name is set
+                               $view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink );

                        }
                }
        }
                        }
                }
        }


@@ -1312,7 +1354,8 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
                $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
 
                if ( false !== $view_link ) {
                $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
 
                if ( false !== $view_link ) {

-                       $return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $view_link . "</a>\n";
+                       $display_link = urldecode( $view_link );
+                       $return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . esc_html( $display_link ) . "</a>\n";

                } else {
                        $return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
                }
                } else {
                        $return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
                }


@@ -1322,32 +1365,24 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
                        $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
                }
        } else {
                        $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
                }
        } else {

-               if ( function_exists( 'mb_strlen' ) ) {
-                       if ( mb_strlen( $post_name ) > 34 ) {
-                               $post_name_abridged = mb_substr( $post_name, 0, 16 ) . '&hellip;' . mb_substr( $post_name, -16 );
-                       } else {
-                               $post_name_abridged = $post_name;
-                       }
+               if ( mb_strlen( $post_name ) > 34 ) {
+                       $post_name_abridged = mb_substr( $post_name, 0, 16 ) . '&hellip;' . mb_substr( $post_name, -16 );

                } else {
                } else {

-                       if ( strlen( $post_name ) > 34 ) {
-                               $post_name_abridged = substr( $post_name, 0, 16 ) . '&hellip;' . substr( $post_name, -16 );
-                       } else {
-                               $post_name_abridged = $post_name;
-                       }
+                       $post_name_abridged = $post_name;

                }
 
                }
 

-               $post_name_html = '<span id="editable-post-name">' . $post_name_abridged . '</span>';
-               $display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) );
+               $post_name_html = '<span id="editable-post-name">' . esc_html( $post_name_abridged ) . '</span>';
+               $display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, esc_html( urldecode( $permalink ) ) );

 
                $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
                $return .= '<span id="sample-permalink"><a href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a></span>\n";
                $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
                $return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __( 'Edit permalink' ) . '">' . __( 'Edit' ) . "</button></span>\n";
 
                $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
                $return .= '<span id="sample-permalink"><a href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a></span>\n";
                $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
                $return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __( 'Edit permalink' ) . '">' . __( 'Edit' ) . "</button></span>\n";

-               $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
+               $return .= '<span id="editable-post-name-full">' . esc_html( $post_name ) . "</span>\n";

        }
 
        /**
        }
 
        /**

-        * Filter the sample permalink HTML markup.
+        * Filters the sample permalink HTML markup.

         *
         * @since 2.9.0
         * @since 4.4.0 Added `$post` parameter.
         *
         * @since 2.9.0
         * @since 4.4.0 Added `$post` parameter.


@@ -1368,24 +1403,21 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
  *
  * @since 2.9.0
  *
  *
  * @since 2.9.0
  *

- * @global int   $content_width
- * @global array $_wp_additional_image_sizes
- *

  * @param int $thumbnail_id ID of the attachment used for thumbnail
  * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
  * @return string html
  */
 function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
  * @param int $thumbnail_id ID of the attachment used for thumbnail
  * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
  * @return string html
  */
 function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {

-       global $content_width, $_wp_additional_image_sizes;
+       $_wp_additional_image_sizes = wp_get_additional_image_sizes();

 
        $post               = get_post( $post );
        $post_type_object   = get_post_type_object( $post->post_type );
 
        $post               = get_post( $post );
        $post_type_object   = get_post_type_object( $post->post_type );

-       $set_thumbnail_link = '<p class="hide-if-no-js"><a title="%s" href="%s" id="set-post-thumbnail" class="thickbox">%s</a></p>';
+       $set_thumbnail_link = '<p class="hide-if-no-js"><a href="%s" id="set-post-thumbnail"%s class="thickbox">%s</a></p>';

        $upload_iframe_src  = get_upload_iframe_src( 'image', $post->ID );
 
        $content = sprintf( $set_thumbnail_link,
        $upload_iframe_src  = get_upload_iframe_src( 'image', $post->ID );
 
        $content = sprintf( $set_thumbnail_link,

-               esc_attr( $post_type_object->labels->set_featured_image ),

                esc_url( $upload_iframe_src ),
                esc_url( $upload_iframe_src ),

+               '', // Empty when there's no featured image set, `aria-describedby` attribute otherwise.

                esc_html( $post_type_object->labels->set_featured_image )
        );
 
                esc_html( $post_type_object->labels->set_featured_image )
        );
 


@@ -1393,7 +1425,7 @@ function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
                $size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : array( 266, 266 );
 
                /**
                $size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : array( 266, 266 );
 
                /**

-                * Filter the size used to display the post thumbnail image in the 'Featured Image' meta box.
+                * Filters the size used to display the post thumbnail image in the 'Featured Image' meta box.

                 *
                 * Note: When a theme adds 'post-thumbnail' support, a special 'post-thumbnail'
                 * image size is registered, which differs from the 'thumbnail' image size
                 *
                 * Note: When a theme adds 'post-thumbnail' support, a special 'post-thumbnail'
                 * image size is registered, which differs from the 'thumbnail' image size


@@ -1413,26 +1445,31 @@ function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
 
                $thumbnail_html = wp_get_attachment_image( $thumbnail_id, $size );
 
 
                $thumbnail_html = wp_get_attachment_image( $thumbnail_id, $size );
 

-               if ( !empty( $thumbnail_html ) ) {
-                       $ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID );
+               if ( ! empty( $thumbnail_html ) ) {

                        $content = sprintf( $set_thumbnail_link,
                        $content = sprintf( $set_thumbnail_link,

-                               esc_attr( $post_type_object->labels->set_featured_image ),

                                esc_url( $upload_iframe_src ),
                                esc_url( $upload_iframe_src ),

+                               ' aria-describedby="set-post-thumbnail-desc"',

                                $thumbnail_html
                        );
                                $thumbnail_html
                        );

-                       $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html( $post_type_object->labels->remove_featured_image ) . '</a></p>';
+                       $content .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">' . __( 'Click the image to edit or update' ) . '</p>';
+                       $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail">' . esc_html( $post_type_object->labels->remove_featured_image ) . '</a></p>';

                }
        }
 
                }
        }
 

+       $content .= '<input type="hidden" id="_thumbnail_id" name="_thumbnail_id" value="' . esc_attr( $thumbnail_id ? $thumbnail_id : '-1' ) . '" />';
+

        /**
        /**

-        * Filter the admin post thumbnail HTML markup to return.
+        * Filters the admin post thumbnail HTML markup to return.

         *
         * @since 2.9.0
         *
         * @since 2.9.0

+        * @since 3.5.0 Added the `$post_id` parameter.
+        * @since 4.6.0 Added the `$thumbnail_id` parameter.

         *
         *

-        * @param string $content Admin post thumbnail HTML markup.
-        * @param int    $post_id Post ID.
+        * @param string $content      Admin post thumbnail HTML markup.
+        * @param int    $post_id      Post ID.
+        * @param int    $thumbnail_id Thumbnail ID.

         */
         */

-       return apply_filters( 'admin_post_thumbnail_html', $content, $post->ID );
+       return apply_filters( 'admin_post_thumbnail_html', $content, $post->ID, $thumbnail_id );

 }
 
 /**
 }
 
 /**


@@ -1501,7 +1538,7 @@ function _admin_notice_post_locked() {
        if ( $user ) {
 
                /**
        if ( $user ) {
 
                /**

-                * Filter whether to show the post locked dialog.
+                * Filters whether to show the post locked dialog.

                 *
                 * Returning a falsey value to the filter will short-circuit displaying the dialog.
                 *
                 *
                 * Returning a falsey value to the filter will short-circuit displaying the dialog.
                 *


@@ -1553,7 +1590,7 @@ function _admin_notice_post_locked() {
                $preview_link = get_preview_post_link( $post->ID, $query_args );
 
                /**
                $preview_link = get_preview_post_link( $post->ID, $query_args );
 
                /**

-                * Filter whether to allow the post lock to be overridden.
+                * Filters whether to allow the post lock to be overridden.

                 *
                 * Returning a falsey value to the filter will disable the ability
                 * to override the post lock.
                 *
                 * Returning a falsey value to the filter will disable the ability
                 * to override the post lock.


@@ -1648,7 +1685,7 @@ function _admin_notice_post_locked() {
 function wp_create_post_autosave( $post_data ) {
        if ( is_numeric( $post_data ) ) {
                $post_id = $post_data;
 function wp_create_post_autosave( $post_data ) {
        if ( is_numeric( $post_data ) ) {
                $post_id = $post_data;

-               $post_data = &$_POST;
+               $post_data = $_POST;

        } else {
                $post_id = (int) $post_data['post_ID'];
        }
        } else {
                $post_id = (int) $post_data['post_ID'];
        }


@@ -1661,14 +1698,14 @@ function wp_create_post_autosave( $post_data ) {
 
        // Store one autosave per author. If there is already an autosave, overwrite it.
        if ( $old_autosave = wp_get_post_autosave( $post_id, $post_author ) ) {
 
        // Store one autosave per author. If there is already an autosave, overwrite it.
        if ( $old_autosave = wp_get_post_autosave( $post_id, $post_author ) ) {

-               $new_autosave = _wp_post_revision_fields( $post_data, true );
+               $new_autosave = _wp_post_revision_data( $post_data, true );

                $new_autosave['ID'] = $old_autosave->ID;
                $new_autosave['post_author'] = $post_author;
 
                // If the new autosave has the same content as the post, delete the autosave.
                $post = get_post( $post_id );
                $autosave_is_different = false;
                $new_autosave['ID'] = $old_autosave->ID;
                $new_autosave['post_author'] = $post_author;
 
                // If the new autosave has the same content as the post, delete the autosave.
                $post = get_post( $post_id );
                $autosave_is_different = false;

-               foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields() ) ) as $field ) {
+               foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {

                        if ( normalize_whitespace( $new_autosave[ $field ] ) != normalize_whitespace( $post->$field ) ) {
                                $autosave_is_different = true;
                                break;
                        if ( normalize_whitespace( $new_autosave[ $field ] ) != normalize_whitespace( $post->$field ) ) {
                                $autosave_is_different = true;
                                break;


@@ -1713,11 +1750,11 @@ function post_preview() {
        $_POST['ID'] = $post_ID;
 
        if ( ! $post = get_post( $post_ID ) ) {
        $_POST['ID'] = $post_ID;
 
        if ( ! $post = get_post( $post_ID ) ) {

-               wp_die( __( 'You are not allowed to edit this post.' ) );
+               wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );

        }
 
        if ( ! current_user_can( 'edit_post', $post->ID ) ) {
        }
 
        if ( ! current_user_can( 'edit_post', $post->ID ) ) {

-               wp_die( __( 'You are not allowed to edit this post.' ) );
+               wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );

        }
 
        $is_autosave = false;
        }
 
        $is_autosave = false;


@@ -1742,8 +1779,13 @@ function post_preview() {
                $query_args['preview_id'] = $post->ID;
                $query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
 
                $query_args['preview_id'] = $post->ID;
                $query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
 

-               if ( isset( $_POST['post_format'] ) )
+               if ( isset( $_POST['post_format'] ) ) {

                        $query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
                        $query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );

+               }
+
+               if ( isset( $_POST['_thumbnail_id'] ) ) {
+                       $query_args['_thumbnail_id'] = ( intval( $_POST['_thumbnail_id'] ) <= 0 ) ? '-1' : intval( $_POST['_thumbnail_id'] );
+               }

        }
 
        return get_preview_post_link( $post, $query_args );
        }
 
        return get_preview_post_link( $post, $query_args );


@@ -1758,7 +1800,7 @@ function post_preview() {
  *
  * @param array $post_data Associative array of the submitted post data.
  * @return mixed The value 0 or WP_Error on failure. The saved post ID on success.
  *
  * @param array $post_data Associative array of the submitted post data.
  * @return mixed The value 0 or WP_Error on failure. The saved post ID on success.

- *               Te ID can be the draft post_id or the autosave revision post_id.
+ *               The ID can be the draft post_id or the autosave revision post_id.

  */
 function wp_autosave( $post_data ) {
        // Back-compat
  */
 function wp_autosave( $post_data ) {
        // Back-compat


@@ -1775,7 +1817,7 @@ function wp_autosave( $post_data ) {
        $post = get_post( $post_id );
 
        if ( ! current_user_can( 'edit_post', $post->ID ) ) {
        $post = get_post( $post_id );
 
        if ( ! current_user_can( 'edit_post', $post->ID ) ) {

-               return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ) );
+               return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to edit this item.' ) );

        }
 
        if ( 'auto-draft' == $post->post_status )
        }
 
        if ( 'auto-draft' == $post->post_status )


@@ -1831,7 +1873,7 @@ function redirect_post($post_id = '') {
        }
 
        /**
        }
 
        /**

-        * Filter the post redirect destination URL.
+        * Filters the post redirect destination URL.

         *
         * @since 2.9.0
         *
         *
         * @since 2.9.0
         *


@@ -1840,4 +1882,4 @@ function redirect_post($post_id = '') {
         */
        wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
        exit;
         */
        wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
        exit;

-}
\ No newline at end of file
+}