--- a/wp/wp-admin/includes/post.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/post.php Mon Oct 14 17:39:30 2019 +0200
@@ -11,7 +11,6 @@
*
* Manipulates $_POST directly.
*
- * @package WordPress
* @since 2.6.0
*
* @param bool $update Are we updating a pre-existing post?
@@ -30,14 +29,14 @@
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
- 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'] )
- 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
- 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'] ) )
@@ -68,14 +67,14 @@
&& ! 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
- 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'] )
- 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
- 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 +159,18 @@
$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'] );
}
+ 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;
}
@@ -173,6 +179,8 @@
*
* @since 1.5.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
* @param array $post_data Optional.
* @return int Post ID.
*/
@@ -201,9 +209,9 @@
$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
- 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' ) ) {
@@ -279,6 +287,8 @@
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'] );
@@ -369,7 +379,7 @@
if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
$fields = array( 'post_title', 'post_content', 'post_excerpt' );
- foreach( $fields as $field ) {
+ foreach ( $fields as $field ) {
if ( isset( $post_data[ $field ] ) ) {
$post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $post_data[ $field ] );
}
@@ -383,7 +393,7 @@
wp_set_post_lock( $post_ID );
- if ( current_user_can( $ptype->cap->edit_others_posts ) ) {
+ if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
if ( ! empty( $post_data['sticky'] ) )
stick_post( $post_ID );
else
@@ -401,6 +411,8 @@
*
* @since 2.7.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
* @param array $post_data Optional, the array of post data to process if not provided will use $_POST superglobal.
* @return array
*/
@@ -417,9 +429,9 @@
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
- wp_die( __('You are not allowed to edit posts.'));
+ wp_die( __('Sorry, you are not allowed to edit posts.'));
}
if ( -1 == $post_data['_status'] ) {
@@ -552,6 +564,11 @@
continue;
}
+ if ( isset( $post_data['post_format'] ) ) {
+ set_post_format( $post_ID, $post_data['post_format'] );
+ unset( $post_data['tax_input']['post_format'] );
+ }
+
$updated[] = wp_update_post( $post_data );
if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
@@ -560,9 +577,6 @@
else
unstick_post( $post_ID );
}
-
- if ( isset( $post_data['post_format'] ) )
- set_post_format( $post_ID, $post_data['post_format'] );
}
return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
@@ -573,7 +587,8 @@
*
* @since 2.0.0
*
- * @param string $post_type A post type string, defaults to 'post'.
+ * @param string $post_type Optional. A post type string. Default 'post'.
+ * @param bool $create_in_db Optional. Whether to insert the post into database. Default false.
* @return WP_Post Post object containing all the default post data as attributes
*/
function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
@@ -606,8 +621,8 @@
$post->post_status = 'draft';
$post->to_ping = '';
$post->pinged = '';
- $post->comment_status = get_option( 'default_comment_status' );
- $post->ping_status = get_option( 'default_ping_status' );
+ $post->comment_status = get_default_comment_status( $post_type );
+ $post->ping_status = get_default_comment_status( $post_type, 'pingback' );
$post->post_pingback = get_option( 'default_pingback_flag' );
$post->post_category = get_option( 'default_category' );
$post->page_template = 'default';
@@ -617,7 +632,7 @@
}
/**
- * 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
*
@@ -627,7 +642,7 @@
$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
*
@@ -637,7 +652,7 @@
$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
*
@@ -654,6 +669,8 @@
*
* @since 2.0.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
* @param string $title Post title
* @param string $content Optional post content
* @param string $date Optional post date
@@ -680,7 +697,7 @@
}
if ( !empty ( $content ) ) {
- $query .= 'AND post_content = %s';
+ $query .= ' AND post_content = %s';
$args[] = $post_content;
}
@@ -695,6 +712,8 @@
*
* @since 2.1.0
*
+ * @global WP_User $current_user
+ *
* @return int|WP_Error
*/
function wp_write_post() {
@@ -705,9 +724,9 @@
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
- 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'] = '';
@@ -834,6 +853,8 @@
*
* @since 1.2.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
* @return mixed
*/
function get_meta_keys() {
@@ -865,6 +886,8 @@
*
* @since 1.2.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
* @param int $postid
* @return mixed
*/
@@ -991,15 +1014,17 @@
$perm = 'readable';
}
- if ( isset($q['orderby']) )
+ if ( isset( $q['orderby'] ) ) {
$orderby = $q['orderby'];
- elseif ( isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft')) )
+ } elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) {
$orderby = 'modified';
+ }
- if ( isset($q['order']) )
+ if ( isset( $q['order'] ) ) {
$order = $q['order'];
- elseif ( isset($q['post_status']) && 'pending' == $q['post_status'] )
+ } elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) {
$order = 'ASC';
+ }
$per_page = "edit_{$post_type}_per_page";
$posts_per_page = (int) get_user_option( $per_page );
@@ -1007,7 +1032,7 @@
$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.
*
@@ -1022,7 +1047,7 @@
$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
*
@@ -1055,6 +1080,8 @@
*
* @since 2.5.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
* @param string $type
* @return mixed
*/
@@ -1096,7 +1123,7 @@
}
/**
- * 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
*
@@ -1109,7 +1136,7 @@
unset($q['post_mime_type']);
}
- foreach( array_keys( $post_mime_types ) as $type ) {
+ foreach ( array_keys( $post_mime_types ) as $type ) {
if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" == $q['attachment-filter'] ) {
$q['post_mime_type'] = $type;
break;
@@ -1120,6 +1147,15 @@
$q['post_parent'] = 0;
}
+ if ( isset( $q['mine'] ) || ( isset( $q['attachment-filter'] ) && 'mine' == $q['attachment-filter'] ) ) {
+ $q['author'] = get_current_user_id();
+ }
+
+ // Filter query clauses to include filenames.
+ if ( isset( $q['s'] ) ) {
+ add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+ }
+
return $q;
}
@@ -1142,7 +1178,7 @@
}
/**
- * 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
*
@@ -1164,7 +1200,7 @@
}
/**
- * 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.
@@ -1183,9 +1219,9 @@
* @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 );
@@ -1228,20 +1264,31 @@
}
/** This filter is documented in wp-admin/edit-tag-form.php */
- $uri = apply_filters( 'editable_slug', $uri );
+ $uri = apply_filters( 'editable_slug', $uri, $post );
if ( !empty($uri) )
$uri .= '/';
$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
}
/** This filter is documented in wp-admin/edit-tag-form.php */
- $permalink = array( $permalink, apply_filters( 'editable_slug', $post->post_name ) );
+ $permalink = array( $permalink, apply_filters( 'editable_slug', $post->post_name, $post ) );
$post->post_status = $original_status;
$post->post_date = $original_date;
$post->post_name = $original_name;
unset($post->filter);
- return $permalink;
+ /**
+ * Filters the sample permalink.
+ *
+ * @since 4.4.0
+ *
+ * @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 WP_Post $post Post object.
+ */
+ return apply_filters( 'get_sample_permalink', $permalink, $post->ID, $title, $name, $post );
}
/**
@@ -1261,74 +1308,68 @@
list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
+ $view_link = false;
+ $preview_target = '';
+
if ( current_user_can( 'read_post', $post->ID ) ) {
- $ptype = get_post_type_object( $post->post_type );
- $view_post = $ptype->labels->view_item;
+ 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 {
+ // 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 );
+ }
+ }
}
- if ( 'publish' == get_post_status( $post ) ) {
- $title = __('Click to edit this part of the permalink');
- } else {
- $title = __('Temporary permalink. Click to edit this part.');
- }
+ // Permalinks without a post/page name placeholder don't have anything to edit
+ if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
+ $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
- if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
- $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink" tabindex="-1">' . $permalink . "</span>\n";
+ if ( false !== $view_link ) {
+ $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";
+ }
+
+ // Encourage a pretty permalink setting
if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) ) {
$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 ) > 30 ) {
- $post_name_abridged = mb_substr( $post_name, 0, 14 ) . '…' . mb_substr( $post_name, -14 );
- } else {
- $post_name_abridged = $post_name;
- }
+ if ( mb_strlen( $post_name ) > 34 ) {
+ $post_name_abridged = mb_substr( $post_name, 0, 16 ) . '…' . mb_substr( $post_name, -16 );
} else {
- if ( strlen( $post_name ) > 30 ) {
- $post_name_abridged = substr( $post_name, 0, 14 ) . '…' . substr( $post_name, -14 );
- } else {
- $post_name_abridged = $post_name;
- }
+ $post_name_abridged = $post_name;
}
- $post_name_html = '<span id="editable-post-name" title="' . $title . '">' . $post_name_abridged . '</span>';
- $display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) );
- $pretty_permalink = str_replace( array( '%pagename%', '%postname%' ), $post_name, urldecode( $permalink ) );
-
- $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
- $return .= '<span id="sample-permalink" tabindex="-1">' . $display_link . "</span>\n";
- $return .= '‎'; // Fix bi-directional text display defect in RTL languages.
- $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button button-small hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __( 'Edit' ) . "</a></span>\n";
- $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
- }
+ $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 ) ) );
- if ( isset( $view_post ) ) {
- if( 'draft' == $post->post_status ) {
- $preview_link = set_url_scheme( get_permalink( $post->ID ) );
- /** This filter is documented in wp-admin/includes/meta-boxes.php */
- $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
- $return .= "<span id='view-post-btn'><a href='" . esc_url( $preview_link ) . "' class='button button-small' target='wp-preview-{$post->ID}'>$view_post</a></span>\n";
- } else {
- if ( empty( $pretty_permalink ) ) {
- $pretty_permalink = $permalink;
- }
-
- $return .= "<span id='view-post-btn'><a href='" . $pretty_permalink . "' class='button button-small'>$view_post</a></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 .= '‎'; // 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">' . 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.
*
- * @param string $return Sample permalink HTML markup.
- * @param int|WP_Post $id Post object or ID.
- * @param string $new_title New sample permalink title.
- * @param string $new_slug New sample permalink slug.
+ * @param string $return Sample permalink HTML markup.
+ * @param int $post_id Post ID.
+ * @param string $new_title New sample permalink title.
+ * @param string $new_slug New sample permalink slug.
+ * @param WP_Post $post Post object.
*/
- $return = apply_filters( 'get_sample_permalink_html', $return, $id, $new_title, $new_slug );
+ $return = apply_filters( 'get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post );
return $return;
}
@@ -1343,38 +1384,68 @@
* @return string html
*/
function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
- global $content_width, $_wp_additional_image_sizes;
-
- $post = get_post( $post );
+ $_wp_additional_image_sizes = wp_get_additional_image_sizes();
- $upload_iframe_src = esc_url( get_upload_iframe_src('image', $post->ID ) );
- $set_thumbnail_link = '<p class="hide-if-no-js"><a title="' . esc_attr__( 'Set featured image' ) . '" href="%s" id="set-post-thumbnail" class="thickbox">%s</a></p>';
- $content = sprintf( $set_thumbnail_link, $upload_iframe_src, esc_html__( 'Set featured image' ) );
+ $post = get_post( $post );
+ $post_type_object = get_post_type_object( $post->post_type );
+ $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,
+ 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 )
+ );
if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
- $old_content_width = $content_width;
- $content_width = 266;
- if ( !isset( $_wp_additional_image_sizes['post-thumbnail'] ) )
- $thumbnail_html = wp_get_attachment_image( $thumbnail_id, array( $content_width, $content_width ) );
- else
- $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
- if ( !empty( $thumbnail_html ) ) {
- $ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID );
- $content = sprintf( $set_thumbnail_link, $upload_iframe_src, $thumbnail_html );
- $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html__( 'Remove featured image' ) . '</a></p>';
+ $size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : array( 266, 266 );
+
+ /**
+ * 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
+ * managed via the Settings > Media screen. See the `$size` parameter description
+ * for more information on default values.
+ *
+ * @since 4.4.0
+ *
+ * @param string|array $size Post thumbnail image size to display in the meta box. Accepts any valid
+ * image size, or an array of width and height values in pixels (in that order).
+ * If the 'post-thumbnail' size is set, default is 'post-thumbnail'. Otherwise,
+ * default is an array with 266 as both the height and width values.
+ * @param int $thumbnail_id Post thumbnail attachment ID.
+ * @param WP_Post $post The post object associated with the thumbnail.
+ */
+ $size = apply_filters( 'admin_post_thumbnail_size', $size, $thumbnail_id, $post );
+
+ $thumbnail_html = wp_get_attachment_image( $thumbnail_id, $size );
+
+ if ( ! empty( $thumbnail_html ) ) {
+ $content = sprintf( $set_thumbnail_link,
+ esc_url( $upload_iframe_src ),
+ ' aria-describedby="set-post-thumbnail-desc"',
+ $thumbnail_html
+ );
+ $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_width = $old_content_width;
}
+ $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 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 );
}
/**
@@ -1382,25 +1453,34 @@
*
* @since 2.5.0
*
- * @param int $post_id ID of the post to check for editing
- * @return integer False: not locked or locked by current user. Int: user ID of user with lock.
+ * @param int $post_id ID of the post to check for editing.
+ * @return int|false ID of the user with lock. False if the post does not exist, post is not locked,
+ * the user with lock does not exist, or the post is locked by current user.
*/
function wp_check_post_lock( $post_id ) {
- if ( !$post = get_post( $post_id ) )
+ if ( ! $post = get_post( $post_id ) ) {
return false;
+ }
- if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) )
+ if ( ! $lock = get_post_meta( $post->ID, '_edit_lock', true ) ) {
return false;
+ }
$lock = explode( ':', $lock );
$time = $lock[0];
$user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
+ if ( ! get_userdata( $user ) ) {
+ return false;
+ }
+
/** This filter is documented in wp-admin/includes/ajax-actions.php */
$time_window = apply_filters( 'wp_check_post_lock_window', 150 );
- if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
+ if ( $time && $time > time() - $time_window && $user != get_current_user_id() ) {
return $user;
+ }
+
return false;
}
@@ -1409,20 +1489,24 @@
*
* @since 2.5.0
*
- * @param int $post_id ID of the post to being edited
- * @return bool|array Returns false if the post doesn't exist of there is no current user, or
- * an array of the lock time and the user ID.
+ * @param int $post_id ID of the post being edited.
+ * @return array|false Array of the lock time and user ID. False if the post does not exist, or
+ * there is no current user.
*/
function wp_set_post_lock( $post_id ) {
- if ( !$post = get_post( $post_id ) )
+ if ( ! $post = get_post( $post_id ) ) {
return false;
- if ( 0 == ($user_id = get_current_user_id()) )
+ }
+
+ if ( 0 == ( $user_id = get_current_user_id() ) ) {
return false;
+ }
$now = time();
$lock = "$now:$user_id";
update_post_meta( $post->ID, '_edit_lock', $lock );
+
return array( $now, $user_id );
}
@@ -1443,13 +1527,14 @@
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.
*
* @since 3.6.0
*
* @param bool $display Whether to display the dialog. Default true.
+ * @param WP_Post $post Post object.
* @param WP_User|bool $user WP_User object on success, false otherwise.
*/
if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
@@ -1482,23 +1567,20 @@
<?php
if ( $locked ) {
+ $query_args = array();
if ( get_post_type_object( $post->post_type )->public ) {
- $preview_link = set_url_scheme( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) );
-
if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
// Latest content is in autosave
$nonce = wp_create_nonce( 'post_preview_' . $post->ID );
- $preview_link = add_query_arg( array( 'preview_id' => $post->ID, 'preview_nonce' => $nonce ), $preview_link );
+ $query_args['preview_id'] = $post->ID;
+ $query_args['preview_nonce'] = $nonce;
}
- } else {
- $preview_link = '';
}
- /** This filter is documented in wp-admin/includes/meta-boxes.php */
- $preview_link = apply_filters( 'preview_post_link', $preview_link, $post );
+ $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.
@@ -1517,9 +1599,13 @@
<div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
<p class="currently-editing wp-tab-first" tabindex="0">
<?php
- _e( 'This content is currently locked.' );
- if ( $override )
- printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+ if ( $override ) {
+ /* translators: %s: user's display name */
+ printf( __( '%s is already editing this post. Do you want to take over?' ), esc_html( $user->display_name ) );
+ } else {
+ /* translators: %s: user's display name */
+ printf( __( '%s is already editing this post.' ), esc_html( $user->display_name ) );
+ }
?>
</p>
<?php
@@ -1542,7 +1628,7 @@
// Allow plugins to prevent some users overriding the post lock
if ( $override ) {
?>
- <a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', get_edit_post_link( $post->ID, 'url' ) ) ); ?>"><?php _e('Take over'); ?></a>
+ <a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e('Take over'); ?></a>
<?php
}
@@ -1556,7 +1642,7 @@
<div class="post-locked-avatar"></div>
<p class="wp-tab-first" tabindex="0">
<span class="currently-editing"></span><br />
- <span class="locked-saving hidden"><img src="<?php echo esc_url( admin_url( 'images/spinner-2x.gif' ) ); ?>" width="16" height="16" /> <?php _e('Saving revision...'); ?></span>
+ <span class="locked-saving hidden"><img src="<?php echo esc_url( admin_url( 'images/spinner-2x.gif' ) ); ?>" width="16" height="16" alt="" /> <?php _e( 'Saving revision…' ); ?></span>
<span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
</p>
<?php
@@ -1583,8 +1669,6 @@
/**
* Creates autosave data for the specified post from $_POST data.
*
- * @package WordPress
- * @subpackage Post_Revisions
* @since 2.6.0
*
* @param mixed $post_data Associative array containing the post data or int post ID.
@@ -1593,7 +1677,7 @@
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'];
}
@@ -1606,14 +1690,14 @@
// 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;
- 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;
@@ -1645,12 +1729,11 @@
}
/**
- * Save draft or manually autosave for showing preview.
+ * Saves a draft or manually autosaves for the purpose of showing a post preview.
*
- * @package WordPress
* @since 2.7.0
*
- * @return str URL to redirect to show the preview
+ * @return string URL to redirect to show the preview.
*/
function post_preview() {
@@ -1658,11 +1741,11 @@
$_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 ) ) {
- wp_die( __( 'You are not allowed to edit this post.' ) );
+ wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
}
$is_autosave = false;
@@ -1681,20 +1764,22 @@
if ( is_wp_error( $saved_post_id ) )
wp_die( $saved_post_id->get_error_message() );
- $query_args = array( 'preview' => 'true' );
+ $query_args = array();
if ( $is_autosave && $saved_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'] );
+ }
+
+ if ( isset( $_POST['_thumbnail_id'] ) ) {
+ $query_args['_thumbnail_id'] = ( intval( $_POST['_thumbnail_id'] ) <= 0 ) ? '-1' : intval( $_POST['_thumbnail_id'] );
+ }
}
- $url = add_query_arg( $query_args, get_permalink( $post->ID ) );
-
- /** This filter is documented in wp-admin/includes/meta-boxes.php */
- return apply_filters( 'preview_post_link', $url, $post );
+ return get_preview_post_link( $post, $query_args );
}
/**
@@ -1706,7 +1791,7 @@
*
* @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
@@ -1723,7 +1808,7 @@
$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 )
@@ -1740,3 +1825,52 @@
return wp_create_post_autosave( wp_slash( $post_data ) );
}
}
+
+/**
+ * Redirect to previous page.
+ *
+ * @param int $post_id Optional. Post ID.
+ */
+function redirect_post($post_id = '') {
+ if ( isset($_POST['save']) || isset($_POST['publish']) ) {
+ $status = get_post_status( $post_id );
+
+ if ( isset( $_POST['publish'] ) ) {
+ switch ( $status ) {
+ case 'pending':
+ $message = 8;
+ break;
+ case 'future':
+ $message = 9;
+ break;
+ default:
+ $message = 6;
+ }
+ } else {
+ $message = 'draft' == $status ? 10 : 1;
+ }
+
+ $location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
+ } elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) {
+ $location = add_query_arg( 'message', 2, wp_get_referer() );
+ $location = explode('#', $location);
+ $location = $location[0] . '#postcustom';
+ } elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) {
+ $location = add_query_arg( 'message', 3, wp_get_referer() );
+ $location = explode('#', $location);
+ $location = $location[0] . '#postcustom';
+ } else {
+ $location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
+ }
+
+ /**
+ * Filters the post redirect destination URL.
+ *
+ * @since 2.9.0
+ *
+ * @param string $location The destination URL.
+ * @param int $post_id The post ID.
+ */
+ wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
+ exit;
+}