<!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>[55785] branches/5.4: Grouped backports to the 5.4 branch.</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/55785">55785</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/55785","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-05-16 15:50:15 +0000 (Tue, 16 May 2023)</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'>Grouped backports to the 5.4 branch.
- Media: Prevent CSRF setting attachment thumbnails.
- Embeds: Add protocol validation for WordPress Embed code.
- I18N: Introduce sanitization function for locale.
- Editor: Ensure block comments are of a valid form.
Merges [55760-55764] to the 5.4 branch.
Props dd32, isabel_brison, martinkrcho, matveb, ocean90, paulkevan, peterwilsoncc, timothyblynjacobs, xknown, youknowriad.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches54packagelockjson">branches/5.4/package-lock.json</a></li>
<li><a href="#branches54packagejson">branches/5.4/package.json</a></li>
<li><a href="#branches54srcjs_enqueueswpembedjs">branches/5.4/src/js/_enqueues/wp/embed.js</a></li>
<li><a href="#branches54srcjsmediaviewsframevideodetailsjs">branches/5.4/src/js/media/views/frame/video-details.js</a></li>
<li><a href="#branches54srcwpadminaboutphp">branches/5.4/src/wp-admin/about.php</a></li>
<li><a href="#branches54srcwpadminincludesajaxactionsphp">branches/5.4/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#branches54srcwpincludesblocksphp">branches/5.4/src/wp-includes/blocks.php</a></li>
<li><a href="#branches54srcwpincludesformattingphp">branches/5.4/src/wp-includes/formatting.php</a></li>
<li><a href="#branches54srcwpincludesl10nphp">branches/5.4/src/wp-includes/l10n.php</a></li>
<li><a href="#branches54srcwpincludesmediaphp">branches/5.4/src/wp-includes/media.php</a></li>
<li><a href="#branches54srcwpincludesversionphp">branches/5.4/src/wp-includes/version.php</a></li>
<li><a href="#branches54testsphpunittestsajaxAttachmentsphp">branches/5.4/tests/phpunit/tests/ajax/Attachments.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branches54testsphpunittestsformattingsanitizeLocaleNamephp">branches/5.4/tests/phpunit/tests/formatting/sanitizeLocaleName.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches54packagelockjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/package-lock.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/package-lock.json 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/package-lock.json 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> "name": "WordPress",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "5.4.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "5.4.13",
</ins><span class="cx" style="display: block; padding: 0 10px"> "lockfileVersion": 1,
</span><span class="cx" style="display: block; padding: 0 10px"> "requires": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "dependencies": {
</span></span></pre></div>
<a id="branches54packagejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/package.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/package.json 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/package.json 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> "name": "WordPress",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "version": "5.4.12",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "version": "5.4.13",
</ins><span class="cx" style="display: block; padding: 0 10px"> "description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
</span><span class="cx" style="display: block; padding: 0 10px"> "repository": {
</span><span class="cx" style="display: block; padding: 0 10px"> "type": "svn",
</span></span></pre></div>
<a id="branches54srcjs_enqueueswpembedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/js/_enqueues/wp/embed.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/js/_enqueues/wp/embed.js 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/src/js/_enqueues/wp/embed.js 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var iframes = document.querySelectorAll( 'iframe[data-secret="' + data.secret + '"]' ),
</span><span class="cx" style="display: block; padding: 0 10px"> blockquotes = document.querySelectorAll( 'blockquote[data-secret="' + data.secret + '"]' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ allowedProtocols = new RegExp( '^https?:$', 'i' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> i, source, height, sourceURL, targetURL;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( i = 0; i < blockquotes.length; i++ ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,6 +80,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sourceURL.href = source.getAttribute( 'src' );
</span><span class="cx" style="display: block; padding: 0 10px"> targetURL.href = data.value;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* Only follow link if the protocol is in the allow list. */
+ if ( ! allowedProtocols.test( targetURL.protocol ) ) {
+ continue;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Only continue if link hostname matches iframe's hostname. */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( targetURL.host === sourceURL.host ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( document.activeElement === source ) {
</span></span></pre></div>
<a id="branches54srcjsmediaviewsframevideodetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/js/media/views/frame/video-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/js/media/views/frame/video-details.js 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/src/js/media/views/frame/video-details.js 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,6 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp.ajax.send( 'set-attachment-thumbnail', {
</span><span class="cx" style="display: block; padding: 0 10px"> data : {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _ajax_nonce: wp.media.view.settings.nonce.setAttachmentThumbnail,
</ins><span class="cx" style="display: block; padding: 0 10px"> urls: urls,
</span><span class="cx" style="display: block; padding: 0 10px"> thumbnail_id: attachment.get( 'id' )
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches54srcwpadminaboutphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-admin/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-admin/about.php 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/src/wp-admin/about.php 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,6 +56,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress version number */
</span><span class="cx" style="display: block; padding: 0 10px"> __( '<strong>Version %s</strong> addressed some security issues.' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '5.4.13'
+ );
+ ?>
+ <?php
+ printf(
+ /* translators: %s: HelpHub URL */
+ __( 'For more information, see <a href="%s">the release notes</a>.' ),
+ sprintf(
+ /* translators: %s: WordPress version */
+ esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+ sanitize_title( '5.4.13' )
+ )
+ );
+ ?>
+ </p>
+ <p>
+ <?php
+ printf(
+ /* translators: %s: WordPress version number */
+ __( '<strong>Version %s</strong> addressed some security issues.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '5.4.12'
</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="branches54srcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-admin/includes/ajax-actions.php 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/src/wp-admin/includes/ajax-actions.php 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2698,6 +2698,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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">+ if ( false === check_ajax_referer( 'set-attachment-thumbnail', '_ajax_nonce', false ) ) {
+ wp_send_json_error();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> // For each URL, try to find its corresponding post ID.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $_POST['urls'] as $url ) {
</span></span></pre></div>
<a id="branches54srcwpincludesblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-includes/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-includes/blocks.php 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/src/wp-includes/blocks.php 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,6 +271,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_block_content( $text, $allowed_html = 'post', $allowed_protocols = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = '';
</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 ( false !== strpos( $text, '<!--' ) && false !== strpos( $text, '--->' ) ) {
+ $text = preg_replace_callback( '%<!--(.*?)--->%', '_filter_block_content_callback', $text );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $blocks = parse_blocks( $text );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blocks as $block ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $block = filter_block_kses( $block, $allowed_html, $allowed_protocols );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,6 +285,19 @@
</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">+ * Callback used for regular expression replacement in filter_block_content().
+ *
+ * @private
+ * @since 6.2.1
+ *
+ * @param array $matches Array of preg_replace_callback matches.
+ * @return string Replacement string.
+ */
+function _filter_block_content_callback( $matches ) {
+ return '<!--' . rtrim( $matches[1], '-' ) . '-->';
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Filters and sanitizes a parsed block to remove non-allowable HTML from block
</span><span class="cx" style="display: block; padding: 0 10px"> * attribute values.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="branches54srcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-includes/formatting.php 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/src/wp-includes/formatting.php 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2375,6 +2375,29 @@
</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">+ * Strips out all characters not allowed in a locale name.
+ *
+ * @since 6.2.1
+ *
+ * @param string $locale_name The locale name to be sanitized.
+ * @return string The sanitized value.
+ */
+function sanitize_locale_name( $locale_name ) {
+ // Limit to A-Z, a-z, 0-9, '_', '-'.
+ $sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $locale_name );
+
+ /**
+ * Filters a sanitized locale name string.
+ *
+ * @since 6.2.1
+ *
+ * @param string $sanitized The sanitized locale name.
+ * @param string $locale_name The locale name before sanitization.
+ */
+ return apply_filters( 'sanitize_locale_name', $sanitized, $locale_name );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Converts lone & characters into `&` (a.k.a. `&`)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 0.71
</span></span></pre></div>
<a id="branches54srcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-includes/l10n.php 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/src/wp-includes/l10n.php 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,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"> if ( ! empty( $_GET['wp_lang'] ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $determined_locale = sanitize_text_field( $_GET['wp_lang'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $determined_locale = sanitize_locale_name( wp_unslash( $_GET['wp_lang'] ) );
</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>
<a id="branches54srcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-includes/media.php 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/src/wp-includes/media.php 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3825,7 +3825,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> 'captions' => ! apply_filters( 'disable_captions', '' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'nonce' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
+ 'setAttachmentThumbnail' => wp_create_nonce( 'set-attachment-thumbnail' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'post' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 0,
</span></span></pre></div>
<a id="branches54srcwpincludesversionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/src/wp-includes/version.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/src/wp-includes/version.php 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/src/wp-includes/version.php 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $wp_version
</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_version = '5.4.12-src';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$wp_version = '5.4.13-src';
</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"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span></span></pre></div>
<a id="branches54testsphpunittestsajaxAttachmentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.4/tests/phpunit/tests/ajax/Attachments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/tests/phpunit/tests/ajax/Attachments.php 2023-05-16 15:46:57 UTC (rev 55784)
+++ branches/5.4/tests/phpunit/tests/ajax/Attachments.php 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,4 +113,95 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $response['success'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $response['data'] );
</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_wp_ajax_set_attachment_thumbnail_success() {
+ // Become an administrator.
+ $post = $_POST;
+ $user_id = self::factory()->user->create(
+ array(
+ 'role' => 'administrator',
+ 'user_login' => 'user_36578_administrator',
+ 'user_email' => 'user_36578_administrator@example.com',
+ )
+ );
+ wp_set_current_user( $user_id );
+ $_POST = array_merge( $_POST, $post );
+
+ // Upload the attachment itself.
+ $filename = DIR_TESTDATA . '/uploads/small-audio.mp3';
+ $contents = file_get_contents( $filename );
+
+ $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
+ $attachment = $this->_make_attachment( $upload );
+
+ // Upload the thumbnail.
+ $filename = DIR_TESTDATA . '/images/waffles.jpg';
+ $contents = file_get_contents( $filename );
+
+ $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
+ $thumbnail = $this->_make_attachment( $upload );
+
+ // Set up a default request.
+ $_POST['_ajax_nonce'] = wp_create_nonce( 'set-attachment-thumbnail' );
+ $_POST['thumbnail_id'] = $thumbnail;
+ $_POST['urls'] = array( wp_get_attachment_url( $attachment ) );
+
+ // Make the request.
+ try {
+ $this->_handleAjax( 'set-attachment-thumbnail' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ // Get the response.
+ $response = json_decode( $this->_last_response, true );
+
+ // Ensure everything is correct.
+ $this->assertTrue( $response['success'] );
+ }
+
+ public function test_wp_ajax_set_attachment_thumbnail_missing_nonce() {
+ // Become an administrator.
+ $post = $_POST;
+ $user_id = self::factory()->user->create(
+ array(
+ 'role' => 'administrator',
+ 'user_login' => 'user_36578_administrator',
+ 'user_email' => 'user_36578_administrator@example.com',
+ )
+ );
+ wp_set_current_user( $user_id );
+ $_POST = array_merge( $_POST, $post );
+
+ // Upload the attachment itself.
+ $filename = DIR_TESTDATA . '/uploads/small-audio.mp3';
+ $contents = file_get_contents( $filename );
+
+ $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
+ $attachment = $this->_make_attachment( $upload );
+
+ // Upload the thumbnail.
+ $filename = DIR_TESTDATA . '/images/waffles.jpg';
+ $contents = file_get_contents( $filename );
+
+ $upload = wp_upload_bits( wp_basename( $filename ), null, $contents );
+ $thumbnail = $this->_make_attachment( $upload );
+
+ // Set up a default request.
+ $_POST['thumbnail_id'] = $thumbnail;
+ $_POST['urls'] = array( wp_get_attachment_url( $attachment ) );
+
+ // Make the request.
+ try {
+ $this->_handleAjax( 'set-attachment-thumbnail' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ // Get the response.
+ $response = json_decode( $this->_last_response, true );
+
+ // Check that success is false without sending nonce.
+ $this->assertFalse( $response['success'] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches54testsphpunittestsformattingsanitizeLocaleNamephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: branches/5.4/tests/phpunit/tests/formatting/sanitizeLocaleName.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.4/tests/phpunit/tests/formatting/sanitizeLocaleName.php (rev 0)
+++ branches/5.4/tests/phpunit/tests/formatting/sanitizeLocaleName.php 2023-05-16 15:50:15 UTC (rev 55785)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,49 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group formatting
+ *
+ * @covers ::sanitize_locale_name
+ */
+class Tests_Formatting_SanitizeLocaleName extends WP_UnitTestCase {
+ /**
+ * @dataProvider data_sanitize_locale_name_returns_non_empty_string
+ */
+ public function test_sanitize_locale_name_returns_non_empty_string( $expected, $input ) {
+ $this->assertSame( $expected, sanitize_locale_name( $input ) );
+ }
+
+ public function data_sanitize_locale_name_returns_non_empty_string() {
+ return array(
+ // array( expected, input )
+ array( 'en_US', 'en_US' ),
+ array( 'en', 'en' ),
+ array( 'fr_FR', 'fr_FR' ),
+ array( 'fr_FR', 'fr_FR' ),
+ array( 'fr_FR-e2791ba830489d23043be8650a22a22b', 'fr_FR-e2791ba830489d23043be8650a22a22b' ),
+ array( '-fr_FRmo', '-fr_FR.mo' ),
+ array( '12324', '$12324' ),
+ array( '4124FRRa', '/4124$$$%%FRRa' ),
+ array( 'FR', '<FR' ),
+ array( 'FR_FR', 'FR_FR' ),
+ array( '--__', '--__' ),
+ );
+ }
+
+ /**
+ * @dataProvider data_sanitize_locale_name_returns_empty_string
+ */
+ public function test_sanitize_locale_name_returns_empty_string( $input ) {
+ $this->assertSame( '', sanitize_locale_name( $input ) );
+ }
+
+ public function data_sanitize_locale_name_returns_empty_string() {
+ return array(
+ // array( input )
+ array( '$<>' ),
+ array( '/$$$%%\\)' ),
+ array( '....' ),
+ array( '@///' ),
+ );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: branches/5.4/tests/phpunit/tests/formatting/sanitizeLocaleName.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>