<!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>[47982] branches/4.3: General: Backport several commits for release.</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/47982">47982</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/47982","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-10 19:03:59 +0000 (Wed, 10 Jun 2020)</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'>General: Backport several commits for release.
- Embeds: Ensure that the title attribute is set correctly on embeds.
- Editor: Prevent HTML decoding on by setting the proper editor context.
- Formatting: Ensure that wp_validate_redirect() sanitizes a wider variety of characters.
- Themes: Ensure a broken theme name is returned properly.
- Administration: Add a new filter to extend set-screen-option.
Merges [47947-47951] to the 4.3 branch.
Props xknown, sstoqnov, vortfu, SergeyBiryukov, whyisjake.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches43srcwpadminincludesmediaphp">branches/4.3/src/wp-admin/includes/media.php</a></li>
<li><a href="#branches43srcwpadminincludesmiscphp">branches/4.3/src/wp-admin/includes/misc.php</a></li>
<li><a href="#branches43srcwpadminthemesphp">branches/4.3/src/wp-admin/themes.php</a></li>
<li><a href="#branches43srcwpincludespluggablephp">branches/4.3/src/wp-includes/pluggable.php</a></li>
<li><a href="#branches43testsphpunittestsformattingredirectphp">branches/4.3/tests/phpunit/tests/formatting/redirect.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches43srcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.3/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.3/src/wp-admin/includes/media.php 2020-06-10 18:51:33 UTC (rev 47981)
+++ branches/4.3/src/wp-admin/includes/media.php 2020-06-10 19:03:59 UTC (rev 47982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2766,9 +2766,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="content"><strong><?php _e( 'Description' ); ?></strong><?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo ': ' . __( 'Displayed on attachment pages.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } ?></label>
- <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ </label>
+ <?php wp_editor( format_to_edit( $post->post_content ), 'attachment_content', $editor_args ); ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $extras = get_compat_media_markup( $post->ID );
</span></span></pre></div>
<a id="branches43srcwpadminincludesmiscphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.3/src/wp-admin/includes/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.3/src/wp-admin/includes/misc.php 2020-06-10 18:51:33 UTC (rev 47981)
+++ branches/4.3/src/wp-admin/includes/misc.php 2020-06-10 19:03:59 UTC (rev 47982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,24 +413,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) {
+ /**
+ * Filters a screen option value before it is set.
+ *
+ * The filter can also be used to modify non-standard [items]_per_page
+ * settings. See the parent function for a full list of standard options.
+ *
+ * Returning false to the filter will skip saving the current option.
+ *
+ * @since 2.8.0
+ * @since 5.4.2 Only applied to options ending with '_page',
+ * or the 'layout_columns' option.
+ *
+ * @see set_screen_options()
+ *
+ * @param bool $keep Whether to save or skip saving the screen option value.
+ * Default false.
+ * @param string $option The option name.
+ * @param int $value The number of rows to use.
+ */
+ $value = apply_filters( 'set-screen-option', false, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+ }
</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"> * Filter a screen option value before it is set.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The filter can also be used to modify non-standard [items]_per_page
- * settings. See the parent function for a full list of standard options.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The dynamic portion of the hook, `$option`, refers to the option name.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Returning false to the filter will skip saving the current option.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.8.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.4.2
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see set_screen_options()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool|int $value Screen option value. Default false to skip.
- * @param string $option The option name.
- * @param int $value The number of rows to use.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $keep Whether to save or skip saving the screen option value.
+ * Default false.
+ * @param string $option The option name.
+ * @param int $value The number of rows to use.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = apply_filters( 'set-screen-option', false, $option, $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = apply_filters( "set_screen_option_{$option}", false, $option, $value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $value )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="branches43srcwpadminthemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.3/src/wp-admin/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.3/src/wp-admin/themes.php 2020-06-10 18:51:33 UTC (rev 47981)
+++ branches/4.3/src/wp-admin/themes.php 2020-06-10 19:03:59 UTC (rev 47982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $broken_themes as $broken_theme ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php echo $broken_theme->get( 'Name' ) ? $broken_theme->display( 'Name' ) : $broken_theme->get_stylesheet(); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php echo $broken_theme->get( 'Name' ) ? $broken_theme->display( 'Name' ) : esc_html( $broken_theme->get_stylesheet() ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo $broken_theme->errors()->get_error_message(); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_delete ) {
</span></span></pre></div>
<a id="branches43srcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.3/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.3/src/wp-includes/pluggable.php 2020-06-10 18:51:33 UTC (rev 47981)
+++ branches/4.3/src/wp-includes/pluggable.php 2020-06-10 19:03:59 UTC (rev 47982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1231,7 +1231,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ){1,40} # ...one or more times
</span><span class="cx" style="display: block; padding: 0 10px"> )/x';
</span><span class="cx" style="display: block; padding: 0 10px"> $location = preg_replace_callback( $regex, '_wp_sanitize_utf8_in_redirect', $location );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%!*\[\]()]|i', '', $location);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%!*\[\]()@]|i', '', $location);
</ins><span class="cx" style="display: block; padding: 0 10px"> $location = wp_kses_no_null($location);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // remove %0d and %0a from location
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1303,7 +1303,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string redirect-sanitized URL
</span><span class="cx" style="display: block; padding: 0 10px"> **/
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_validate_redirect($location, $default = '') {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $location = trim( $location, " \t\n\r\0\x08\x0B" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $location = wp_sanitize_redirect( trim( $location, " \t\n\r\0\x08\x0B" ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
</span><span class="cx" style="display: block; padding: 0 10px"> if ( substr($location, 0, 2) == '//' )
</span><span class="cx" style="display: block; padding: 0 10px"> $location = 'http:' . $location;
</span></span></pre></div>
<a id="branches43testsphpunittestsformattingredirectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.3/tests/phpunit/tests/formatting/redirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.3/tests/phpunit/tests/formatting/redirect.php 2020-06-10 18:51:33 UTC (rev 47981)
+++ branches/4.3/tests/phpunit/tests/formatting/redirect.php 2020-06-10 19:03:59 UTC (rev 47982)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('http://example.com/whyisthisintheurl/?param[1]=foo', wp_sanitize_redirect('http://example.com/whyisthisintheurl/?param[1]=foo'));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('http://[2606:2800:220:6d:26bf:1447:aa7]/', wp_sanitize_redirect('http://[2606:2800:220:6d:26bf:1447:aa7]/'));
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals('http://example.com/search.php?search=(amistillhere)', wp_sanitize_redirect('http://example.com/search.php?search=(amistillhere)'));
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals('http://example.com/@username', wp_sanitize_redirect('http://example.com/@username'));
</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></pre>
</div>
</div>
</body>
</html>