<!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>[47959] branches/5.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/47959">47959</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/47959","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-06-10 17:58:07 +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 [47948-47951] to the 5.3 branch.
Props xknown, sstoqnov, vortfu, SergeyBiryukov, whyisjake.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches53srcwpadminincludesmediaphp">branches/5.3/src/wp-admin/includes/media.php</a></li>
<li><a href="#branches53srcwpadminincludesmiscphp">branches/5.3/src/wp-admin/includes/misc.php</a></li>
<li><a href="#branches53srcwpadminthemesphp">branches/5.3/src/wp-admin/themes.php</a></li>
<li><a href="#branches53srcwpincludescommenttemplatephp">branches/5.3/src/wp-includes/comment-template.php</a></li>
<li><a href="#branches53srcwpincludesdefaultfiltersphp">branches/5.3/src/wp-includes/default-filters.php</a></li>
<li><a href="#branches53srcwpincludesembedphp">branches/5.3/src/wp-includes/embed.php</a></li>
<li><a href="#branches53srcwpincludespluggablephp">branches/5.3/src/wp-includes/pluggable.php</a></li>
<li><a href="#branches53testsphpunittestsblocksrenderphp">branches/5.3/tests/phpunit/tests/blocks/render.php</a></li>
<li><a href="#branches53testsphpunittestsoembedfilterResultphp">branches/5.3/tests/phpunit/tests/oembed/filterResult.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches53">branches/5.3/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.3
</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/5.3 2020-06-10 17:47:28 UTC (rev 47958)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.3 2020-06-10 17:58:07 UTC (rev 47959)
</ins><a id="branches53"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.3</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/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:46583,46605-46606,46613,46616,46656,46658,46665,46668,46676-46677,46700-46703,46705,46707,46709,46711,46713,46715,46719-46720,46722,46724,46738,46745-46748,46753,46756-46758,46761-46762,46765,46770,46772,46779,46782,46786,46788,46793,46795,46797,46809,46813,46815,46817,46822,46824,46832,46835,46837-46838,46840,46842,46844-46845,46849,46851-46852,46854,46856,46858,46860,46862,46864,46866,46868,46870,46872,46874,46883,46885,46887,46902,46965-46969,46973-46974,46976,46981,46997,46999-47001,47010,47040,47070-47073,47136,47289,47313,47318,47341,47412,47418,47633-47638,47730,47790,47887,47889
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:46583,46605-46606,46613,46616,46656,46658,46665,46668,46676-46677,46700-46703,46705,46707,46709,46711,46713,46715,46719-46720,46722,46724,46738,46745-46748,46753,46756-46758,46761-46762,46765,46770,46772,46779,46782,46786,46788,46793,46795,46797,46809,46813,46815,46817,46822,46824,46832,46835,46837-46838,46840,46842,46844-46845,46849,46851-46852,46854,46856,46858,46860,46862,46864,46866,46868,46870,46872,46874,46883,46885,46887,46902,46965-46969,46973-46974,46976,46981,46997,46999-47001,47010,47040,47070-47073,47136,47289,47313,47318,47341,47412,47418,47633-47638,47730,47790,47887,47889,47947-47951
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches53srcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-admin/includes/media.php 2020-06-10 17:47:28 UTC (rev 47958)
+++ branches/5.3/src/wp-admin/includes/media.php 2020-06-10 17:58:07 UTC (rev 47959)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3212,7 +3212,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"> </label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php wp_editor( format_to_edit( $post->post_content ), 'attachment_content', $editor_args ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="branches53srcwpadminincludesmiscphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-admin/includes/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-admin/includes/misc.php 2020-06-10 17:47:28 UTC (rev 47958)
+++ branches/5.3/src/wp-admin/includes/misc.php 2020-06-10 17:58:07 UTC (rev 47959)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,23 +679,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * Filters 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 $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.
</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 ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</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="branches53srcwpadminthemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-admin/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-admin/themes.php 2020-06-10 17:47:28 UTC (rev 47958)
+++ branches/5.3/src/wp-admin/themes.php 2020-06-10 17:58:07 UTC (rev 47959)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +408,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_resume ) {
</span></span></pre></div>
<a id="branches53srcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-includes/comment-template.php 2020-06-10 17:47:28 UTC (rev 47958)
+++ branches/5.3/src/wp-includes/comment-template.php 2020-06-10 17:58:07 UTC (rev 47959)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,9 +593,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The possibly truncated comment excerpt.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_excerpt( $comment_ID = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment = get_comment( $comment_ID );
- $comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $comment_ID );
</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 ( ! post_password_required( $comment->comment_post_ID ) ) {
+ $comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
+ } else {
+ $comment_text = __( 'Password protected' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Maximum number of words used in a comment excerpt. */
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_excerpt_length = intval( _x( '20', 'comment_excerpt_length' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches53srcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-includes/default-filters.php 2020-06-10 17:47:28 UTC (rev 47958)
+++ branches/5.3/src/wp-includes/default-filters.php 2020-06-10 17:58:07 UTC (rev 47959)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,8 +574,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_embed', 'shortcode_unautop' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_excerpt_embed', 'wp_embed_excerpt_attachment' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'oembed_dataparse', 'wp_filter_oembed_iframe_title_attribute', 5, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'oembed_dataparse', 'wp_filter_oembed_result', 10, 3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'oembed_dataparse', 'wp_filter_oembed_iframe_title_attribute', 20, 3 );
</del><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_oembed_result', 'wp_filter_pre_oembed_result', 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches53srcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-includes/embed.php 2020-06-10 17:47:28 UTC (rev 47958)
+++ branches/5.3/src/wp-includes/embed.php 2020-06-10 17:58:07 UTC (rev 47959)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,13 +797,26 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = ! empty( $data->title ) ? $data->title : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pattern = '`<iframe[^>]*?title=(\\\\\'|\\\\"|[\'"])([^>]*?)\1`i';
- $has_title_attr = preg_match( $pattern, $result, $matches );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pattern = '`<iframe([^>]*)>`i';
+ if ( preg_match( $pattern, $result, $matches ) ) {
+ $attrs = wp_kses_hair( $matches[1], wp_allowed_protocols() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $has_title_attr && ! empty( $matches[2] ) ) {
- $title = $matches[2];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $attrs as $attr => $item ) {
+ $lower_attr = strtolower( $attr );
+ if ( $lower_attr === $attr ) {
+ continue;
+ }
+ if ( ! isset( $attrs[ $lower_attr ] ) ) {
+ $attrs[ $lower_attr ] = $item;
+ unset( $attrs[ $attr ] );
+ }
+ }
</ins><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">+ if ( ! empty( $attrs['title']['value'] ) ) {
+ $title = $attrs['title']['value'];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the title attribute of the given oEmbed HTML iframe.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -820,11 +833,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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 ( $has_title_attr ) {
- // Remove the old title, $matches[1]: quote, $matches[2]: title attribute value.
- $result = str_replace( ' title=' . $matches[1] . $matches[2] . $matches[1], '', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $attrs['title'] ) ) {
+ unset( $attrs['title'] );
+ $attr_string = join( ' ', wp_list_pluck( $attrs, 'whole' ) );
+ $result = str_replace( $matches[0], '<iframe ' . trim( $attr_string ) . '>', $result );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> return str_ireplace( '<iframe ', sprintf( '<iframe title="%s" ', esc_attr( $title ) ), $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches53srcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/src/wp-includes/pluggable.php 2020-06-10 17:47:28 UTC (rev 47958)
+++ branches/5.3/src/wp-includes/pluggable.php 2020-06-10 17:58:07 UTC (rev 47959)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1391,9 +1391,9 @@
</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" );
- // browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
- if ( substr( $location, 0, 2 ) == '//' ) {
</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" ) );
+ // Browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'.
+ if ( '//' === substr( $location, 0, 2 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $location = 'http:' . $location;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches53testsphpunittestsblocksrenderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/tests/phpunit/tests/blocks/render.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/tests/phpunit/tests/blocks/render.php 2020-06-10 17:47:28 UTC (rev 47958)
+++ branches/5.3/tests/phpunit/tests/blocks/render.php 2020-06-10 17:58:07 UTC (rev 47959)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,6 +289,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $global_post, $post );
</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">+ public function test_render_latest_comments_on_password_protected_post() {
+ $post_id = self::factory()->post->create(
+ array(
+ 'post_password' => 'password',
+ )
+ );
+ $comment_text = wp_generate_password( 10, false );
+ self::factory()->comment->create(
+ array(
+ 'comment_post_ID' => $post_id,
+ 'comment_content' => $comment_text,
+ )
+ );
+ $comments = do_blocks( '<!-- wp:latest-comments {"commentsToShow":1,"displayExcerpt":true} /-->' );
+
+ $this->assertNotContains( $comment_text, $comments );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 45109
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="branches53testsphpunittestsoembedfilterResultphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.3/tests/phpunit/tests/oembed/filterResult.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.3/tests/phpunit/tests/oembed/filterResult.php 2020-06-10 17:47:28 UTC (rev 47958)
+++ branches/5.3/tests/phpunit/tests/oembed/filterResult.php 2020-06-10 17:58:07 UTC (rev 47959)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,4 +102,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"></iframe>', $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function _data_oembed_test_strings() {
+ return array(
+ array(
+ '<blockquote></blockquote><iframe title=""></iframe>',
+ '<blockquote class="wp-embedded-content"></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title="Hola"></iframe>',
+ ),
+ array(
+ '<blockquote class="foo" id="bar"><strong><a href="" target=""></a></strong></blockquote><iframe width=123></iframe>',
+ '<blockquote class="wp-embedded-content"><a href=""></a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title="Hola" width="123"></iframe>',
+ ),
+ array(
+ '<blockquote><iframe width="100"></iframe></blockquote><iframe stitle="aaaa"></iframe>',
+ '<blockquote class="wp-embedded-content"><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title="Hola" width="100"></iframe></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title="Hola"></iframe>',
+ ),
+ array(
+ "<blockquote><iframe title=' width=\"'></iframe></blockquote><iframe title='' height=' title=' width=\"'' heigt='123'\"></iframe>",
+ '<blockquote class="wp-embedded-content"><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title=" width=""></iframe></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);" title=" width="" height=\' title=\' width="\'\' heigt=\'123\'"></iframe>',
+ ),
+ );
+ }
+
+ /**
+ * @dataProvider _data_oembed_test_strings
+ */
+ public function test_wp_filter_pre_oembed_custom_result( $html, $expected ) {
+ $data = (object) [
+ 'type' => 'rich',
+ 'title' => 'Hola',
+ 'html' => $html,
+ ];
+ $actual = _wp_oembed_get_object()->data2html( $data, 'https://untrusted.localhost' );
+ $this->assertEquals( $expected, $actual );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>