Skip to content

Commit c380c9c

Browse files
desrosjdesrosj
committed
Merge remote-tracking branch 'upstream/trunk' into add/mariadb-11-4
2 parents c63f628 + 5728ebb commit c380c9c

File tree

74 files changed

+1077
-381
lines changed

Some content is hidden

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

74 files changed

+1077
-381
lines changed

‎.github/workflows/pull-request-comments.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123

124124
- name: Leave a comment about testing with Playground
125125
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
126-
if: ${{ github.actor != 'dependabot' }}
126+
if: ${{ github.actor != 'dependabot[bot]' }}
127127
with:
128128
script: |
129129
const fs = require( 'fs' );
@@ -172,7 +172,7 @@ jobs:
172172
permissions:
173173
issues: write
174174
pull-requests: write
175-
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name == 'pull_request_target' && ! github.event.pull_request.draft && github.event.pull_request.state == 'open' && github.actor != 'dependabot' }}
175+
if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name == 'pull_request_target' && ! github.event.pull_request.draft && github.event.pull_request.state == 'open' && github.actor != 'dependabot[bot]' }}
176176
steps:
177177
- name: Check for Trac ticket and manage comment
178178
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1

‎Gruntfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ module.exports = function(grunt) {
10661066
files = spawn( 'gh', [ 'api', 'graphql', '-f', query] );
10671067

10681068
if ( 0 !== files.status ) {
1069-
grunt.fatal( 'Unable to fetch Twemoji file list' );
1069+
grunt.fatal( files.stderr.toString() );
10701070
}
10711071

10721072
try {

‎package-lock.json‎

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

‎package.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -83,58 +83,58 @@
8383
"@wordpress/api-fetch": "7.8.2",
8484
"@wordpress/autop": "4.8.1",
8585
"@wordpress/blob": "4.8.1",
86-
"@wordpress/block-directory": "5.8.17",
87-
"@wordpress/block-editor": "14.3.14",
88-
"@wordpress/block-library": "9.8.15",
86+
"@wordpress/block-directory": "5.8.18",
87+
"@wordpress/block-editor": "14.3.15",
88+
"@wordpress/block-library": "9.8.16",
8989
"@wordpress/block-serialization-default-parser": "5.8.1",
9090
"@wordpress/blocks": "13.8.5",
91-
"@wordpress/commands": "1.8.10",
92-
"@wordpress/components": "28.8.10",
91+
"@wordpress/commands": "1.8.11",
92+
"@wordpress/components": "28.8.11",
9393
"@wordpress/compose": "7.8.3",
94-
"@wordpress/core-commands": "1.8.14",
95-
"@wordpress/core-data": "7.8.14",
96-
"@wordpress/customize-widgets": "5.8.15",
94+
"@wordpress/core-commands": "1.8.15",
95+
"@wordpress/core-data": "7.8.15",
96+
"@wordpress/customize-widgets": "5.8.16",
9797
"@wordpress/data": "10.8.3",
9898
"@wordpress/data-controls": "4.8.3",
99-
"@wordpress/dataviews": "4.4.10",
99+
"@wordpress/dataviews": "4.4.11",
100100
"@wordpress/date": "5.8.2",
101101
"@wordpress/deprecated": "4.8.2",
102102
"@wordpress/dom": "4.8.2",
103103
"@wordpress/dom-ready": "4.8.1",
104-
"@wordpress/edit-post": "8.8.17",
105-
"@wordpress/edit-site": "6.8.17",
106-
"@wordpress/edit-widgets": "6.8.15",
107-
"@wordpress/editor": "14.8.17",
104+
"@wordpress/edit-post": "8.8.18",
105+
"@wordpress/edit-site": "6.8.18",
106+
"@wordpress/edit-widgets": "6.8.16",
107+
"@wordpress/editor": "14.8.18",
108108
"@wordpress/element": "6.8.1",
109109
"@wordpress/escape-html": "3.8.1",
110-
"@wordpress/fields": "0.0.15",
111-
"@wordpress/format-library": "5.8.14",
110+
"@wordpress/fields": "0.0.16",
111+
"@wordpress/format-library": "5.8.15",
112112
"@wordpress/hooks": "4.8.2",
113113
"@wordpress/html-entities": "4.8.1",
114114
"@wordpress/i18n": "5.8.2",
115115
"@wordpress/icons": "10.8.2",
116116
"@wordpress/interactivity": "6.8.5",
117117
"@wordpress/interactivity-router": "2.8.6",
118-
"@wordpress/interface": "6.8.10",
118+
"@wordpress/interface": "6.8.11",
119119
"@wordpress/is-shallow-equal": "5.8.1",
120120
"@wordpress/keyboard-shortcuts": "5.8.3",
121121
"@wordpress/keycodes": "4.8.2",
122-
"@wordpress/list-reusable-blocks": "5.8.10",
122+
"@wordpress/list-reusable-blocks": "5.8.11",
123123
"@wordpress/media-utils": "5.8.2",
124124
"@wordpress/notices": "5.8.3",
125-
"@wordpress/nux": "9.8.10",
126-
"@wordpress/patterns": "2.8.14",
127-
"@wordpress/plugins": "7.8.10",
128-
"@wordpress/preferences": "4.8.10",
125+
"@wordpress/nux": "9.8.11",
126+
"@wordpress/patterns": "2.8.15",
127+
"@wordpress/plugins": "7.8.11",
128+
"@wordpress/preferences": "4.8.11",
129129
"@wordpress/preferences-persistence": "2.8.2",
130130
"@wordpress/primitives": "4.8.1",
131131
"@wordpress/priority-queue": "3.8.1",
132132
"@wordpress/private-apis": "1.8.1",
133133
"@wordpress/redux-routine": "5.8.1",
134-
"@wordpress/reusable-blocks": "5.8.14",
134+
"@wordpress/reusable-blocks": "5.8.15",
135135
"@wordpress/rich-text": "7.8.3",
136136
"@wordpress/router": "1.8.1",
137-
"@wordpress/server-side-render": "5.8.10",
137+
"@wordpress/server-side-render": "5.8.11",
138138
"@wordpress/shortcode": "4.8.1",
139139
"@wordpress/style-engine": "2.8.1",
140140
"@wordpress/sync": "1.8.1",
@@ -143,7 +143,7 @@
143143
"@wordpress/url": "4.8.1",
144144
"@wordpress/viewport": "6.8.3",
145145
"@wordpress/warning": "3.8.1",
146-
"@wordpress/widgets": "4.8.14",
146+
"@wordpress/widgets": "4.8.15",
147147
"@wordpress/wordcount": "4.8.1",
148148
"backbone": "1.6.0",
149149
"clipboard": "2.0.11",

‎src/js/_enqueues/admin/post.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -659,8 +659,10 @@ jQuery( function($) {
659659
'li.popular-category > label input[type="checkbox"]',
660660
function() {
661661
var t = $(this), c = t.is(':checked'), id = t.val();
662-
if ( id && t.parents('#taxonomy-'+taxonomy).length )
663-
$('#in-' + taxonomy + '-' + id + ', #in-popular-' + taxonomy + '-' + id).prop( 'checked', c );
662+
if ( id && t.parents('#taxonomy-'+taxonomy).length ) {
663+
$('input[id^="in-' + taxonomy + '-' + id + '"]').prop('checked', c);
664+
$('input#in-popular-' + taxonomy + '-' + id).prop('checked', c);
665+
}
664666
}
665667
);
666668

‎src/js/_enqueues/lib/nav-menu.js‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
$selected = 'selected';
320320
}
321321

322-
$html += '<option ' + $selected + ' value="0">No Parent</option>';
322+
$html += '<option ' + $selected + ' value="0">' + wp.i18n._x( 'No Parent', 'menu item without a parent in navigation menu' ) + '</option>';
323323

324324
$.each( menuItems, function() {
325325
var menuItem = $(this),
@@ -364,7 +364,13 @@
364364
if ( i == itemPosition ) {
365365
$selected = 'selected';
366366
}
367-
$html += '<option ' + $selected + ' value="' + i + '">' + i + ' of ' + totalMenuItems + '</option>';
367+
var itemString = wp.i18n.sprintf(
368+
/* translators: 1: The current menu item number, 2: The total number of menu items. */
369+
wp.i18n._x( '%1$s of %2$s', 'part of a total number of menu items' ),
370+
i,
371+
totalMenuItems
372+
);
373+
$html += '<option ' + $selected + ' value="' + i + '">' + itemString + '</option>';
368374
}
369375

370376
} else {
@@ -380,7 +386,13 @@
380386
if ( i == itemPosition ) {
381387
$selected = 'selected';
382388
}
383-
$html += '<option ' + $selected + ' value="' + i + '">' + i + ' of ' + totalSubMenuItems + '</option>';
389+
var submenuString = wp.i18n.sprintf(
390+
/* translators: 1: The current submenu item number, 2: The total number of submenu items. */
391+
wp.i18n._x( '%1$s of %2$s', 'part of a total number of menu items' ),
392+
i,
393+
totalSubMenuItems
394+
);
395+
$html += '<option ' + $selected + ' value="' + i + '">' + submenuString + '</option>';
384396
}
385397

386398
}

‎src/wp-admin/async-upload.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@
7474
}
7575
?>
7676
<span class="media-item-copy-container copy-to-clipboard-container edit-attachment">
77-
<button type="button" class="button button-small copy-attachment-url" data-clipboard-text="<?php echo $file_url; ?>"><?php _e( 'Copy URL to clipboard' ); ?></button>
77+
<button type="button" class="button button-small copy-attachment-url"
78+
data-clipboard-text="<?php echo esc_url( $file_url ); ?>"
79+
><?php _e( 'Copy URL to clipboard' ); ?></button>
7880
<span class="success hidden" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
7981
</span>
8082
</div>

‎src/wp-admin/css/colors/modern/colors.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$scheme-name: "modern";
44
$base-color: #1e1e1e;
55
$highlight-color: #3858e9;
6-
$menu-submenu-focus-text: #33f078;
6+
$menu-submenu-focus-text: #7b90ff;
77
$notification-color: $highlight-color;
88

99
$link: $highlight-color;

‎src/wp-admin/css/common.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2462,7 +2462,7 @@ h1.nav-tab-wrapper, /* Back-compat for pre-4.4 */
24622462
}
24632463
.nav-menus-php .metabox-holder .accordion-section-title span.dashicons.dashicons-arrow-down::before {
24642464
position: relative;
2465-
left: -1px
2465+
left: -1px;
24662466
}
24672467

24682468
.nav-menus-php .metabox-holder .accordion-section.open .accordion-section-title span.dashicons.dashicons-arrow-down {

‎src/wp-admin/css/customize-controls.css‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,17 +553,19 @@ body.trashing #publish-settings {
553553
.15s border-color ease-in-out;
554554
}
555555

556-
.accordion-section-title:has(button.accordion-trigger) {
556+
.accordion-section-title:has(button.accordion-trigger),
557+
#customize-controls .current-panel .control-section > h3.accordion-section-title:has(button.accordion-trigger) {
557558
padding: 0;
558559
}
559560

560561
.accordion-section-title button.accordion-trigger {
561562
all: unset;
562563
width: 100%;
563564
height: 100%;
564-
padding: 10px 10px 11px 14px;
565+
padding: 10px 30px 11px 14px;
565566
display: flex;
566567
align-items: center;
568+
box-sizing: border-box;
567569
}
568570

569571
.accordion-section-title button.accordion-trigger:has(.menu-in-location) {
@@ -587,6 +589,7 @@ body.trashing #publish-settings {
587589
#customize-outer-theme-controls .accordion-section-title:after {
588590
content: "\f345";
589591
color: #a7aaad;
592+
pointer-events: none;
590593
}
591594

592595
#customize-theme-controls .accordion-section-content,

0 commit comments

Comments
 (0)