<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[44060] branches/4.5/src/wp-admin: Editor: Remove unwanted fields before saving posts.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44060">44060</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44060","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-13 01:44:41 +0000 (Thu, 13 Dec 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: Remove unwanted fields before saving posts.
The `meta_input`, `file`, and `guid` fields are not intended to be updated through user input.
Merges <a href="https://core.trac.wordpress.org/changeset/44047">[44047]</a> to the 4.5 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches45srcwpadminincludesajaxactionsphp">branches/4.5/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#branches45srcwpadminincludespostphp">branches/4.5/src/wp-admin/includes/post.php</a></li>
<li><a href="#branches45srcwpadminpostphp">branches/4.5/src/wp-admin/post.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches45">branches/4.5/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.5
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.5 2018-12-13 01:43:52 UTC (rev 44059)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.5 2018-12-13 01:44:41 UTC (rev 44060)
</ins><a id="branches45"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.5</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.6:38615,41414
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.8:42478
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:42434
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/branches/5.0:43988,43994,44014,44017
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/branches/5.0:43988,43994,44014,44017,44047
</ins><span class="cx" style="display: block; padding: 0 10px"> /trunk:37192,37228,37247,37249,37273,37282,37285,37288,37301,37352,37417,37433,37435,37448,37452,37472,37525-37527,37559,37651,37678,37697,37708,37710,37720,37724,37729-37730,37748,37755,38524,39645,39659,39759-39760,39772,39795,39807-39808,39831,39850,39956,40148,40160,40169,40183,40195,40241,40255,40257-40259,40269,40271,40400,40538,40604,40677,40692,40704,40716,40723,40736,40851-40852,41072,41393,41395,41397-41398,41448,41457,41470,41483,41496,41522,41662,41870,42056,42119-42120,42258-42261,42424,42433,42892-42894,44021,44048
</span><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches45srcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.5/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.5/src/wp-admin/includes/ajax-actions.php 2018-12-13 01:43:52 UTC (rev 44059)
+++ branches/4.5/src/wp-admin/includes/ajax-actions.php 2018-12-13 01:44:41 UTC (rev 44060)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2026,8 +2026,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_data = isset( $_REQUEST['post_data'] ) ? $_REQUEST['post_data'] : array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_data = ! empty( $_REQUEST['post_data'] ) ? _wp_get_allowed_postdata( _wp_translate_postdata( false, (array) $_REQUEST['post_data'] ) ) : array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $post_data ) ) {
+ wp_die( $post_data->get_error_message() );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the context is custom header or background, make sure the uploaded file is an image.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'] );
</span></span></pre></div>
<a id="branches45srcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.5/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.5/src/wp-admin/includes/post.php 2018-12-13 01:43:52 UTC (rev 44059)
+++ branches/4.5/src/wp-admin/includes/post.php 2018-12-13 01:44:41 UTC (rev 44060)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,6 +176,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns only allowed post data fields
+ *
+ * @since 4.9.9
+ *
+ * @param array $post_data Array of post data. Defaults to the contents of $_POST.
+ * @return object|bool WP_Error on failure, true on success.
+ */
+function _wp_get_allowed_postdata( $post_data = null ) {
+ if ( empty( $post_data ) ) {
+ $post_data = $_POST;
+ }
+
+ // Pass through errors
+ if ( is_wp_error( $post_data ) ) {
+ return $post_data;
+ }
+
+ return array_diff_key( $post_data, array_flip( array( 'meta_input', 'file', 'guid' ) ) );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Update an existing post with values provided in $_POST.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,6 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = _wp_translate_postdata( true, $post_data );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error($post_data) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( $post_data->get_error_message() );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translated = _wp_get_allowed_postdata( $post_data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Post Formats
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['post_format'] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,7 +342,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_data = isset( $post_data['attachments'][ $post_ID ] ) ? $post_data['attachments'][ $post_ID ] : array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_data = apply_filters( 'attachment_fields_to_save', $post_data, $attachment_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translated = apply_filters( 'attachment_fields_to_save', $translated, $attachment_data );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Convert taxonomy input to term IDs, to avoid ambiguity.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +387,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_data['tax_input'][ $taxonomy ] = $clean_terms;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translated['tax_input'][ $taxonomy ] = $clean_terms;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,18 +395,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_ID, '_edit_last', get_current_user_id() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $success = wp_update_post( $post_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $success = wp_update_post( $translated );
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the save failed, see if we can sanity check the main fields and try again
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'post_title', 'post_content', 'post_excerpt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $fields as $field ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_data[ $field ] ) ) {
- $post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $post_data[ $field ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $translated[ $field ] ) ) {
+ $translated[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $translated[ $field ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_update_post( $post_data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_update_post( $translated );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Now that we have an ID we can fix any attachment anchor hrefs
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,9 +566,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $post_data['tax_input']['category'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_data['post_ID'] = $post_ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_type'] = $post->post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_mime_type'] = $post->post_mime_type;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_data['guid'] = $post->guid;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'comment_status', 'ping_status', 'post_author' ) as $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $post_data[ $field ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,14 +576,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_data['ID'] = $post_ID;
- $post_data['post_ID'] = $post_ID;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $post_data = _wp_translate_postdata( true, $post_data );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $post_data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $skipped[] = $post_ID;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_data = _wp_get_allowed_postdata( $post_data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updated[] = wp_update_post( $post_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,8 +592,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unstick_post( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_data['post_format'] ) )
- set_post_format( $post_ID, $post_data['post_format'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $shared_post_data['post_format'] ) )
+ set_post_format( $post_ID, $shared_post_data['post_format'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,9 +774,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $translated = _wp_translate_postdata( false );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error($translated) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $translated;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translated = _wp_get_allowed_postdata( $translated );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create the post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ID = wp_insert_post( $_POST );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ID = wp_insert_post( $translated );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $post_ID ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $post_ID;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1664,6 +1685,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data = _wp_translate_postdata( true, $post_data );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $post_data ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return $post_data;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_data = _wp_get_allowed_postdata( $post_data );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_author = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches45srcwpadminpostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.5/src/wp-admin/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.5/src/wp-admin/post.php 2018-12-13 01:43:52 UTC (rev 44059)
+++ branches/4.5/src/wp-admin/post.php 2018-12-13 01:44:41 UTC (rev 44060)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the thumbnail filename
</span><span class="cx" style="display: block; padding: 0 10px"> $newmeta = wp_get_attachment_metadata( $post_id, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $newmeta['thumb'] = $_POST['thumb'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $newmeta['thumb'] = wp_basename( $_POST['thumb'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_attachment_metadata( $post_id, $newmeta );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>