Skip to content

Commit a4569cd

Browse files
committed
Merge branch 'trunk' into html-api/add-html-processor
2 parents 74c9e6b + 35c0ab3 commit a4569cd

117 files changed

Lines changed: 1912 additions & 1254 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package-lock.json

Lines changed: 245 additions & 232 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,61 +78,61 @@
7878
},
7979
"dependencies": {
8080
"@wordpress/a11y": "3.26.1",
81-
"@wordpress/annotations": "2.26.3",
81+
"@wordpress/annotations": "2.26.4",
8282
"@wordpress/api-fetch": "6.23.1",
8383
"@wordpress/autop": "3.26.1",
8484
"@wordpress/blob": "3.26.1",
85-
"@wordpress/block-directory": "4.3.11",
86-
"@wordpress/block-editor": "11.3.9",
87-
"@wordpress/block-library": "8.3.11",
85+
"@wordpress/block-directory": "4.3.12",
86+
"@wordpress/block-editor": "11.3.10",
87+
"@wordpress/block-library": "8.3.12",
8888
"@wordpress/block-serialization-default-parser": "4.26.1",
8989
"@wordpress/blocks": "12.3.3",
90-
"@wordpress/components": "23.3.6",
90+
"@wordpress/components": "23.3.7",
9191
"@wordpress/compose": "6.3.3",
9292
"@wordpress/core-data": "6.3.3",
93-
"@wordpress/customize-widgets": "4.3.11",
93+
"@wordpress/customize-widgets": "4.3.12",
9494
"@wordpress/data": "8.3.3",
9595
"@wordpress/data-controls": "2.26.3",
9696
"@wordpress/date": "4.26.2",
9797
"@wordpress/deprecated": "3.26.1",
9898
"@wordpress/dom": "3.26.1",
9999
"@wordpress/dom-ready": "3.26.1",
100-
"@wordpress/edit-post": "7.3.11",
101-
"@wordpress/edit-site": "5.3.11",
102-
"@wordpress/edit-widgets": "5.3.11",
103-
"@wordpress/editor": "13.3.9",
100+
"@wordpress/edit-post": "7.3.12",
101+
"@wordpress/edit-site": "5.3.12",
102+
"@wordpress/edit-widgets": "5.3.12",
103+
"@wordpress/editor": "13.3.10",
104104
"@wordpress/element": "5.3.2",
105105
"@wordpress/escape-html": "2.26.1",
106-
"@wordpress/format-library": "4.3.9",
106+
"@wordpress/format-library": "4.3.10",
107107
"@wordpress/hooks": "3.26.1",
108108
"@wordpress/html-entities": "3.26.1",
109109
"@wordpress/i18n": "4.26.1",
110110
"@wordpress/icons": "9.17.2",
111-
"@wordpress/interface": "5.3.7",
111+
"@wordpress/interface": "5.3.8",
112112
"@wordpress/is-shallow-equal": "4.26.1",
113113
"@wordpress/keyboard-shortcuts": "4.3.3",
114114
"@wordpress/keycodes": "3.26.2",
115-
"@wordpress/list-reusable-blocks": "4.3.6",
115+
"@wordpress/list-reusable-blocks": "4.3.7",
116116
"@wordpress/media-utils": "4.17.2",
117117
"@wordpress/notices": "3.26.3",
118118
"@wordpress/nux": "6.0.0",
119119
"@wordpress/plugins": "5.3.3",
120-
"@wordpress/preferences": "3.3.6",
120+
"@wordpress/preferences": "3.3.7",
121121
"@wordpress/preferences-persistence": "1.18.1",
122122
"@wordpress/primitives": "3.24.2",
123123
"@wordpress/priority-queue": "2.26.1",
124124
"@wordpress/private-apis": "0.8.1",
125125
"@wordpress/redux-routine": "4.26.1",
126-
"@wordpress/reusable-blocks": "4.3.9",
127-
"@wordpress/rich-text": "6.3.3",
128-
"@wordpress/server-side-render": "4.3.6",
126+
"@wordpress/reusable-blocks": "4.3.10",
127+
"@wordpress/rich-text": "6.3.4",
128+
"@wordpress/server-side-render": "4.3.7",
129129
"@wordpress/shortcode": "3.26.1",
130130
"@wordpress/style-engine": "1.9.1",
131131
"@wordpress/token-list": "2.26.1",
132132
"@wordpress/url": "3.27.1",
133133
"@wordpress/viewport": "5.3.3",
134134
"@wordpress/warning": "2.26.1",
135-
"@wordpress/widgets": "3.3.9",
135+
"@wordpress/widgets": "3.3.10",
136136
"@wordpress/wordcount": "3.26.1",
137137
"backbone": "1.4.1",
138138
"clipboard": "2.0.11",

src/js/_enqueues/wp/embed.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949

5050
var iframes = document.querySelectorAll( 'iframe[data-secret="' + data.secret + '"]' ),
5151
blockquotes = document.querySelectorAll( 'blockquote[data-secret="' + data.secret + '"]' ),
52+
allowedProtocols = new RegExp( '^https?:$', 'i' ),
5253
i, source, height, sourceURL, targetURL;
5354

5455
for ( i = 0; i < blockquotes.length; i++ ) {
@@ -84,6 +85,11 @@
8485
sourceURL.href = source.getAttribute( 'src' );
8586
targetURL.href = data.value;
8687

88+
/* Only follow link if the protocol is in the allow list. */
89+
if ( ! allowedProtocols.test( targetURL.protocol ) ) {
90+
continue;
91+
}
92+
8793
/* Only continue if link hostname matches iframe's hostname. */
8894
if ( targetURL.host === sourceURL.host ) {
8995
if ( document.activeElement === source ) {

src/js/media/views/frame/video-details.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ VideoDetails = MediaDetails.extend(/** @lends wp.media.view.MediaFrame.VideoDeta
106106

107107
wp.ajax.send( 'set-attachment-thumbnail', {
108108
data : {
109+
_ajax_nonce: wp.media.view.settings.nonce.setAttachmentThumbnail,
109110
urls: urls,
110111
thumbnail_id: attachment.get( 'id' )
111112
}

src/wp-activate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
*/
8888
function do_activate_header() {
8989
/**
90-
* Fires before the Site Activation page is loaded.
90+
* Fires within the `<head>` section of the Site Activation page.
9191
*
9292
* Fires on the {@see 'wp_head'} action.
9393
*

src/wp-admin/edit-link-form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<div id="addressdiv" class="postbox">
122122
<h2 class="postbox-header"><label for="link_url"><?php _e( 'Web Address' ); ?></label></h2>
123123
<div class="inside">
124-
<input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_attr( $link->link_url ); ?>" id="link_url" />
124+
<input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_url( $link->link_url ); ?>" id="link_url" />
125125
<p><?php _e( 'Example: <code>https://wordpress.org/</code> &#8212; do not forget the <code>https://</code>' ); ?></p>
126126
</div>
127127
</div>

src/wp-admin/includes/ajax-actions.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2771,6 +2771,10 @@ function wp_ajax_set_attachment_thumbnail() {
27712771
wp_send_json_error();
27722772
}
27732773

2774+
if ( false === check_ajax_referer( 'set-attachment-thumbnail', '_ajax_nonce', false ) ) {
2775+
wp_send_json_error();
2776+
}
2777+
27742778
$post_ids = array();
27752779
// For each URL, try to find its corresponding post ID.
27762780
foreach ( $_POST['urls'] as $url ) {

src/wp-admin/includes/class-core-upgrader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public function upgrade_strings() {
3434
$this->strings['unpack_package'] = __( 'Unpacking the update&#8230;' );
3535
$this->strings['copy_failed'] = __( 'Could not copy files.' );
3636
$this->strings['copy_failed_space'] = __( 'Could not copy files. You may have run out of disk space.' );
37-
$this->strings['start_rollback'] = __( 'Attempting to roll back to previous version.' );
38-
$this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version.' );
37+
$this->strings['start_rollback'] = __( 'Attempting to restore the previous version.' );
38+
$this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has been restored to your previous version.' );
3939
}
4040

4141
/**

src/wp-admin/includes/class-pclzip.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,8 +1170,8 @@ function duplicate($p_archive)
11701170
// ----- Reset the error handler
11711171
$this->privErrorReset();
11721172

1173-
// ----- Look if the $p_archive is a PclZip object
1174-
if (is_object($p_archive) && $p_archive instanceof pclzip)
1173+
// ----- Look if the $p_archive is an instantiated PclZip object
1174+
if ($p_archive instanceof pclzip)
11751175
{
11761176

11771177
// ----- Duplicate the archive
@@ -1234,8 +1234,8 @@ function merge($p_archive_to_add)
12341234
return(0);
12351235
}
12361236

1237-
// ----- Look if the $p_archive_to_add is a PclZip object
1238-
if (is_object($p_archive_to_add) && $p_archive_to_add instanceof pclzip)
1237+
// ----- Look if the $p_archive_to_add is an instantiated PclZip object
1238+
if ($p_archive_to_add instanceof pclzip)
12391239
{
12401240

12411241
// ----- Merge the archive

src/wp-admin/includes/class-wp-application-passwords-list-table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class WP_Application_Passwords_List_Table extends WP_List_Table {
2121
*
2222
* @since 5.6.0
2323
*
24-
* @return array
24+
* @return string[] Array of column titles keyed by their column name.
2525
*/
2626
public function get_columns() {
2727
return array(

0 commit comments

Comments
 (0)