Skip to content

Commit

Permalink
Merge branch 'WordPress:trunk' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
deepakrohillas authored Aug 19, 2024
2 parents b62e5ae + be4fe64 commit da22274
Show file tree
Hide file tree
Showing 157 changed files with 7,466 additions and 2,453 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/props-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
# You cannot filter this event for PR comments only.
# However, the logic below does short-circuit the workflow for issues.
issue_comment:
type:
types:
- created
# This event will run everytime a new PR review is initially submitted.
pull_request_review:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
const prBody = pr.body ?? '';
const prTitle = pr.title ?? '';
const tracTicketRegex = new RegExp( 'https?://core.trac.wordpress.org/ticket/([0-9]+)', 'g' );
const tracTicketRegex = new RegExp( '(https?://core.trac.wordpress.org/ticket/|Core-)([0-9]+)', 'g' );
const tracTicketMatches = prBody.match( tracTicketRegex ) || prTitle.match( tracTicketRegex );
if ( ! tracTicketMatches ) {
Expand Down
127 changes: 127 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
# Aliases names and emails inside of commits.
# See https://git-scm.com/docs/gitmailmap
#
# Some entries appear as duplicates, but are both required to correct
# identities with just the wrong name as well as those with the wrong
# name and also the wrong email address.

# Accounts with a display name.
Aaron D. Campbell <[email protected]> <aaroncampbell@602fd350-edb4-49c9-b593-d223f7449a82>
Aaron Jorbin <[email protected]> <jorbin@602fd350-edb4-49c9-b593-d223f7449a82>
Adam Silverstein <[email protected]> <adamsilverstein@602fd350-edb4-49c9-b593-d223f7449a82>
Alex King <[email protected]> <alexkingorg@602fd350-edb4-49c9-b593-d223f7449a82>
Alex Shiels <[email protected]> <tellyworth@602fd350-edb4-49c9-b593-d223f7449a82>
André <[email protected]>
André <[email protected]> <oandregal@602fd350-edb4-49c9-b593-d223f7449a82>
Andrea Fercia <[email protected]> <afercia@602fd350-edb4-49c9-b593-d223f7449a82>
Andrew Duthie <[email protected]> <aduth@602fd350-edb4-49c9-b593-d223f7449a82>
Andrew Nacin <[email protected]> <nacin@602fd350-edb4-49c9-b593-d223f7449a82>
Andrew Ozz <[email protected]> <azaozz@602fd350-edb4-49c9-b593-d223f7449a82>
Anthony Burchell <[email protected]> <antpb@602fd350-edb4-49c9-b593-d223f7449a82>
Anton Timmermans <[email protected]> <atimmer@602fd350-edb4-49c9-b593-d223f7449a82>
Bernie Reiter <[email protected]>
Bernie Reiter <[email protected]> <bernhard-reiter@602fd350-edb4-49c9-b593-d223f7449a82>
Boone Gorges <[email protected]> <boonebgorges@602fd350-edb4-49c9-b593-d223f7449a82>
Carlos Bravo <[email protected]> <cbravobernal@602fd350-edb4-49c9-b593-d223f7449a82>
Colin Stewart <[email protected]> <costdev@602fd350-edb4-49c9-b593-d223f7449a82>
Daniel Bachhuber <[email protected]> <danielbachhuber@602fd350-edb4-49c9-b593-d223f7449a82>
Daniel Richards <[email protected]> <talldanwp@602fd350-edb4-49c9-b593-d223f7449a82>
Daryl Koopersmith <[email protected]> <koop@602fd350-edb4-49c9-b593-d223f7449a82>
David A. Kennedy <[email protected]> <davidakennedy@602fd350-edb4-49c9-b593-d223f7449a82>
David Baumwald <[email protected]> <davidbaumwald@602fd350-edb4-49c9-b593-d223f7449a82>
Dennis Snell <[email protected]> <dmsnell@602fd350-edb4-49c9-b593-d223f7449a82>
Dion Hulse <[email protected]> <dd32@602fd350-edb4-49c9-b593-d223f7449a82>
Dominik Schilling <[email protected]>
Dominik Schilling <[email protected]> <ocean90@602fd350-edb4-49c9-b593-d223f7449a82>
Donncha O Caoimh <[email protected]> <donncha@602fd350-edb4-49c9-b593-d223f7449a82>
Dougal Campbell <[email protected]> <dougal@602fd350-edb4-49c9-b593-d223f7449a82>
Drew Jaynes <[email protected]>
Drew Jaynes <[email protected]> <drewapicture@602fd350-edb4-49c9-b593-d223f7449a82>
Drew Jaynes <[email protected]> <DrewAPicture@602fd350-edb4-49c9-b593-d223f7449a82>
Ella <[email protected]>
Ella <[email protected]> <ellatrix@602fd350-edb4-49c9-b593-d223f7449a82>
Ella <[email protected]> <iseulde@602fd350-edb4-49c9-b593-d223f7449a82>
Ella <[email protected]> <[email protected]>
Eric Andrew Lewis <[email protected]> <ericlewis@602fd350-edb4-49c9-b593-d223f7449a82>
Felix Arntz <[email protected]> <flixos90@602fd350-edb4-49c9-b593-d223f7449a82>
Gary Pendergast <[email protected]> <pento@602fd350-edb4-49c9-b593-d223f7449a82>
Greg Ziółkowski <[email protected]>
Greg Ziółkowski <[email protected]> <gziolo@602fd350-edb4-49c9-b593-d223f7449a82>
Helen Hou-Sandi <[email protected]> <helen@602fd350-edb4-49c9-b593-d223f7449a82>
Ian Belanger <[email protected]> <ianbelanger@602fd350-edb4-49c9-b593-d223f7449a82>
Ian Dunn <[email protected]> <iandunn@602fd350-edb4-49c9-b593-d223f7449a82>
Ian Stewart <[email protected]> <iandstewart@602fd350-edb4-49c9-b593-d223f7449a82>
Isabel Brison <[email protected]> <isabel_brison@602fd350-edb4-49c9-b593-d223f7449a82>
Jake Spurlock <[email protected]> <whyisjake@602fd350-edb4-49c9-b593-d223f7449a82>
James Nylen <[email protected]> <jnylen0@602fd350-edb4-49c9-b593-d223f7449a82>
Jb Audras <[email protected]> <audrasjb@602fd350-edb4-49c9-b593-d223f7449a82>
Jeff Ong <[email protected]> <jffng@602fd350-edb4-49c9-b593-d223f7449a82>
Jeremy Felt <[email protected]> <jeremyfelt@602fd350-edb4-49c9-b593-d223f7449a82>
Joe Dolson <[email protected]> <joedolson@602fd350-edb4-49c9-b593-d223f7449a82>
Joe Hoyle <[email protected]> <joehoyle@602fd350-edb4-49c9-b593-d223f7449a82>
Joe McGill <[email protected]> <joemcgill@602fd350-edb4-49c9-b593-d223f7449a82>
John Blackbourn <[email protected]> <johnbillion@602fd350-edb4-49c9-b593-d223f7449a82>
John James Jacoby <[email protected]> <johnjamesjacoby@602fd350-edb4-49c9-b593-d223f7449a82>
Jon Cave <[email protected]> <duck_@602fd350-edb4-49c9-b593-d223f7449a82>
Jonathan Desrosiers <[email protected]> <desrosj@602fd350-edb4-49c9-b593-d223f7449a82>
Jonny Harris <[email protected]> <spacedmonkey@602fd350-edb4-49c9-b593-d223f7449a82>
Jorge Costa <[email protected]> <jorgefilipecosta@602fd350-edb4-49c9-b593-d223f7449a82>
Joseph Scott <[email protected]> <josephscott@602fd350-edb4-49c9-b593-d223f7449a82>
Juliette Reinders Folmer <[email protected]>
Juliette Reinders Folmer <[email protected]> <jrf@602fd350-edb4-49c9-b593-d223f7449a82>
K. Adam White <[email protected]> <kadamwhite@602fd350-edb4-49c9-b593-d223f7449a82>
Kelly Choyce-Dwan <[email protected]>
Kelly Choyce-Dwan <[email protected]> <ryelle@602fd350-edb4-49c9-b593-d223f7449a82>
Kira Schroder <[email protected]> <mikeschroder@602fd350-edb4-49c9-b593-d223f7449a82>
Kira Schroder <[email protected]> <[email protected]>
Konstantin Kovshenin <[email protected]> <kovshenin@602fd350-edb4-49c9-b593-d223f7449a82>
Konstantin Obenland <[email protected]>
Konstantin Obenland <[email protected]> <obenland@602fd350-edb4-49c9-b593-d223f7449a82>
Lance Willett <[email protected]> <lancewillett@602fd350-edb4-49c9-b593-d223f7449a82>
Marius L. J <[email protected]> <clorith@602fd350-edb4-49c9-b593-d223f7449a82>
Mark Jaquith <[email protected]> <markjaquith@602fd350-edb4-49c9-b593-d223f7449a82>
Matias Ventura <[email protected]> <matveb@602fd350-edb4-49c9-b593-d223f7449a82>
Matt Mullenweg <[email protected]> <matt@602fd350-edb4-49c9-b593-d223f7449a82>
Matt Thomas <[email protected]> <iammattthomas@602fd350-edb4-49c9-b593-d223f7449a82>
Mel Choyce <[email protected]> <melchoyce@602fd350-edb4-49c9-b593-d223f7449a82>
Michael Adams <[email protected]>
Michael Adams <[email protected]> <mdawaffe@602fd350-edb4-49c9-b593-d223f7449a82>
Michael Arestad <[email protected]> <michael-arestad@602fd350-edb4-49c9-b593-d223f7449a82>
Michal Czaplinski <[email protected]> <czapla@602fd350-edb4-49c9-b593-d223f7449a82>
Miguel Fonseca <[email protected]> <mcsf@602fd350-edb4-49c9-b593-d223f7449a82>
Mike Little <[email protected]> <mikelittle@602fd350-edb4-49c9-b593-d223f7449a82>
Nikolay Bachiyski <[email protected]> <nbachiyski@602fd350-edb4-49c9-b593-d223f7449a82>
Omar Reiss <[email protected]> <omarreiss@602fd350-edb4-49c9-b593-d223f7449a82>
Pascal Birchler <[email protected]> <swissspidy@602fd350-edb4-49c9-b593-d223f7449a82>
Pete Mall <[email protected]> <petemall@602fd350-edb4-49c9-b593-d223f7449a82>
Peter Westwood <[email protected]> <westi@602fd350-edb4-49c9-b593-d223f7449a82>
Peter Wilson <[email protected]> <peterwilsoncc@602fd350-edb4-49c9-b593-d223f7449a82>
Rachel Baker <[email protected]> <rachelbaker@602fd350-edb4-49c9-b593-d223f7449a82>
Riad Benguella <[email protected]> <youknowriad@602fd350-edb4-49c9-b593-d223f7449a82>
Robert Anderson <[email protected]> <noisysocks@602fd350-edb4-49c9-b593-d223f7449a82>
Ron Rennick <[email protected]> <wpmuguru@602fd350-edb4-49c9-b593-d223f7449a82>
Ryan Boren <[email protected]> <ryan@602fd350-edb4-49c9-b593-d223f7449a82>
Ryan McCue <[email protected]> <rmccue@602fd350-edb4-49c9-b593-d223f7449a82>
Scott Taylor <[email protected]> <wonderboymusic@602fd350-edb4-49c9-b593-d223f7449a82>
Sergey Biryukov <[email protected]> <sergeybiryukov@602fd350-edb4-49c9-b593-d223f7449a82>
Sergey Biryukov <[email protected]> <SergeyBiryukov@602fd350-edb4-49c9-b593-d223f7449a82>
Tammie Lister <[email protected]>
Tammie Lister <[email protected]> <karmatosed@602fd350-edb4-49c9-b593-d223f7449a82>
Timothy Jacobs <[email protected]> <timothyblynjacobs@602fd350-edb4-49c9-b593-d223f7449a82>
Timothy Jacobs <[email protected]> <TimothyBlynJacobs@602fd350-edb4-49c9-b593-d223f7449a82>
Tonya Mork <[email protected]> <hellofromTonya@602fd350-edb4-49c9-b593-d223f7449a82>
Tonya Mork <[email protected]> <[email protected]>
Weston Ruter <[email protected]> <westonruter@602fd350-edb4-49c9-b593-d223f7449a82>

# Accounts without a corresponding display name.
allancole <[email protected]> <allancole@602fd350-edb4-49c9-b593-d223f7449a82>
bumpbot <[email protected]> <bumpbot@602fd350-edb4-49c9-b593-d223f7449a82>
jverber <[email protected]> <jverber@602fd350-edb4-49c9-b593-d223f7449a82>
laurelfulford <[email protected]> <laurelfulford@602fd350-edb4-49c9-b593-d223f7449a82>
luisherranz <[email protected]> <luisherranz@602fd350-edb4-49c9-b593-d223f7449a82>
michelvaldrighi <[email protected]> <michelvaldrighi@602fd350-edb4-49c9-b593-d223f7449a82>
potbot <[email protected]> <potbot@602fd350-edb4-49c9-b593-d223f7449a82>
ramonopoly <[email protected]> <ramonopoly@602fd350-edb4-49c9-b593-d223f7449a82>
rob1n <[email protected]> <rob1n@602fd350-edb4-49c9-b593-d223f7449a82>
scribu <[email protected]> <scribu@602fd350-edb4-49c9-b593-d223f7449a82>
zieladam <[email protected]> <zieladam@602fd350-edb4-49c9-b593-d223f7449a82>
56 changes: 28 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"@wordpress/warning": "3.0.1",
"@wordpress/widgets": "4.0.6",
"@wordpress/wordcount": "4.0.1",
"backbone": "1.5.0",
"backbone": "1.6.0",
"clipboard": "2.0.11",
"core-js-url-browser": "3.6.4",
"element-closest": "^3.0.2",
Expand All @@ -165,9 +165,9 @@
"react": "18.3.1",
"react-dom": "18.3.1",
"react-is": "18.3.1",
"regenerator-runtime": "0.14.0",
"underscore": "1.13.6",
"whatwg-fetch": "3.6.17",
"regenerator-runtime": "0.14.1",
"underscore": "1.13.7",
"whatwg-fetch": "3.6.20",
"wicg-inert": "3.1.2"
},
"scripts": {
Expand Down
10 changes: 9 additions & 1 deletion src/js/_enqueues/admin/inline-edit-post.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,16 @@ window.wp = window.wp || {};
inlineEditPost.edit( this );
});

// Clone quick edit categories for the bulk editor.
var beCategories = $( '#inline-edit fieldset.inline-edit-categories' ).clone();

// Make "id" attributes globally unique.
beCategories.find( '*[id]' ).each( function() {
this.id = 'bulk-edit-' + this.id;
});

$('#bulk-edit').find('fieldset:first').after(
$('#inline-edit fieldset.inline-edit-categories').clone()
beCategories
).siblings( 'fieldset:last' ).prepend(
$( '#inline-edit .inline-edit-tags-wrap' ).clone()
);
Expand Down
2 changes: 1 addition & 1 deletion src/js/media/controllers/library.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Library = wp.media.controller.State.extend(/** @lends wp.media.controller.Librar
isImageAttachment: function( attachment ) {
// If uploading, we know the filename but not the mime type.
if ( attachment.get('uploading') ) {
return /\.(jpe?g|png|gif|webp|avif)$/i.test( attachment.get('filename') );
return /\.(jpe?g|png|gif|webp|avif|heic)$/i.test( attachment.get('filename') );
}

return attachment.get('type') === 'image';
Expand Down
5 changes: 5 additions & 0 deletions src/wp-admin/css/dashboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,11 @@ body #dashboard-widgets .postbox form .submit {
font-weight: 400;
}

#network_dashboard_right_now p input {
margin: 2px 1px;
vertical-align: middle;
}

/* Dashboard right now - Colors */

#dashboard_right_now .sub {
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/css/list-tables.css
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@ tr.inline-edit-row td {
width: 75%;
}

.inline-edit-row #post_parent,
.inline-edit-row select[name="post_parent"],
.inline-edit-row select[name="page_template"] {
max-width: 80%;
}
Expand Down
16 changes: 9 additions & 7 deletions src/wp-admin/customize.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,20 @@
}
}

$url = ! empty( $_REQUEST['url'] ) ? sanitize_text_field( $_REQUEST['url'] ) : '';
$return = ! empty( $_REQUEST['return'] ) ? sanitize_text_field( $_REQUEST['return'] ) : '';
$autofocus = ! empty( $_REQUEST['autofocus'] ) ? sanitize_text_field( $_REQUEST['autofocus'] ) : '';
$url = ! empty( $_REQUEST['url'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['url'] ) ) : '';
$return = ! empty( $_REQUEST['return'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['return'] ) ) : '';
$autofocus = ! empty( $_REQUEST['autofocus'] ) && is_array( $_REQUEST['autofocus'] )
? array_map( 'sanitize_text_field', wp_unslash( $_REQUEST['autofocus'] ) )
: array();

if ( ! empty( $url ) ) {
$wp_customize->set_preview_url( wp_unslash( $url ) );
$wp_customize->set_preview_url( $url );
}
if ( ! empty( $return ) ) {
$wp_customize->set_return_url( wp_unslash( $return ) );
$wp_customize->set_return_url( $return );
}
if ( ! empty( $autofocus ) && is_array( $autofocus ) ) {
$wp_customize->set_autofocus( wp_unslash( $autofocus ) );
if ( ! empty( $autofocus ) ) {
$wp_customize->set_autofocus( $autofocus );
}

$registered = $wp_scripts->registered;
Expand Down
Loading

0 comments on commit da22274

Please sign in to comment.