Skip to content

Commit 93c2dbb

Browse files
authored
Merge branch 'trunk' into trunk
2 parents 0d086fc + 1ef9d70 commit 93c2dbb

26 files changed

Lines changed: 1449 additions & 877 deletions

‎.github/workflows/reusable-phpunit-tests-v3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
# - Submit the test results to the WordPress.org host test results.
130130
phpunit-tests:
131131
name: ${{ ( inputs.phpunit-test-groups || inputs.coverage-report ) && format( 'PHP {0} with ', inputs.php ) || '' }} ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.db-innovation && ' (innovation release)' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }} ${{ 'example.org' != inputs.tests-domain && inputs.tests-domain || '' }}
132-
runs-on: ${{ vars.PHPUNIT_RUNNER || inputs.os }}
132+
runs-on: ${{ vars.RUNNERS_NAME || inputs.os }}
133133
timeout-minutes: ${{ inputs.coverage-report && 120 || inputs.php == '8.4' && 30 || 20 }}
134134
permissions:
135135
contents: read

‎composer.json‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,35 @@
1616
"php": ">=7.4"
1717
},
1818
"suggest": {
19+
"ext-apcu": "*",
20+
"ext-bc": "*",
21+
"ext-curl": "*",
1922
"ext-dom": "*",
23+
"ext-exif": "*",
24+
"ext-fileinfo": "*",
25+
"ext-filter": "*",
2026
"ext-ftp": "*",
27+
"ext-gd": "*",
28+
"ext-iconv": "*",
29+
"ext-igbinary": "*",
30+
"ext-imagick": "*",
31+
"ext-intl": "*",
32+
"ext-mbstring": "*",
33+
"ext-memcached": "*",
2134
"ext-mysqli": "*",
22-
"ext-ssh2": "*"
35+
"ext-opcache": "*",
36+
"ext-openssl": "*",
37+
"ext-redis": "*",
38+
"ext-shmop": "*",
39+
"ext-simplexml": "*",
40+
"ext-sockets": "*",
41+
"ext-sodium": "*",
42+
"ext-ssh2": "*",
43+
"ext-timezonedb": "*",
44+
"ext-xml": "*",
45+
"ext-xmlreader": "*",
46+
"ext-zip": "*",
47+
"ext-zlib": "*"
2348
},
2449
"require-dev": {
2550
"composer/ca-bundle": "1.5.13",

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

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,35 +1025,6 @@ body #dashboard-widgets .postbox form .submit {
10251025
top: 0;
10261026
}
10271027

1028-
/* On This Day dashboard widget */
1029-
1030-
#wp_dashboard_on_this_day h3 {
1031-
font-weight: 600;
1032-
}
1033-
1034-
#wp_dashboard_on_this_day li {
1035-
margin: 0;
1036-
padding: 0;
1037-
}
1038-
1039-
#wp_dashboard_on_this_day ul ul {
1040-
margin: 0 0 0 18px;
1041-
padding: 0;
1042-
list-style: disc;
1043-
}
1044-
1045-
#wp_dashboard_on_this_day ul ul li + li {
1046-
margin-top: 6px;
1047-
}
1048-
1049-
#wp_dashboard_on_this_day .wp-on-this-day-widget > ul > li + li {
1050-
margin-top: 16px;
1051-
}
1052-
1053-
#wp_dashboard_on_this_day .wp-on-this-day-post-author {
1054-
color: #646970;
1055-
}
1056-
10571028
/* Browse happy box */
10581029

10591030
#dashboard-widgets #dashboard_browser_nag.postbox .inside {

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,16 @@ border color while dragging a file over the uploader drop area */
451451
margin: 0 6px 0 0;
452452
}
453453

454+
/* Match the spacing the grid view toolbar gets from
455+
`.attachments-browser .media-toolbar` in media-views.css, so the Media
456+
Library filter bar is consistent in both modes. The grid view toolbar is
457+
excluded so that rule stays the single source of its own padding: media.css
458+
is printed after media-views.css here, so an unscoped rule would override
459+
it. */
460+
.upload-php .wp-filter:not(.media-toolbar) {
461+
padding: 12px 16px;
462+
}
463+
454464
/**
455465
* Media Library grid view
456466
*/

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,6 +1976,11 @@ body.full-overlay-active {
19761976
line-height: 2.30769231; /* 30px for 32px height with 13px font */
19771977
}
19781978

1979+
.theme-install-overlay .wp-full-overlay-header .button.updating-message:before,
1980+
.theme-install-overlay .wp-full-overlay-header .button.updated-message:before {
1981+
line-height: 1.5; /* 30px (20px * 1.5) - matches the button above */
1982+
}
1983+
19791984
.theme-install-overlay .wp-full-overlay-sidebar {
19801985
background: #f0f0f1;
19811986
border-right: 1px solid #dcdcde;

‎src/wp-admin/includes/dashboard-on-this-day.php‎

Lines changed: 0 additions & 254 deletions
This file was deleted.

‎src/wp-admin/includes/dashboard.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ function wp_dashboard_setup() {
8888
wp_add_dashboard_widget( 'dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press' );
8989
}
9090

91-
// On This Day.
92-
if ( ! function_exists( 'wp_dashboard_on_this_day_setup' ) ) {
93-
require_once ABSPATH . 'wp-admin/includes/dashboard-on-this-day.php';
94-
}
95-
96-
wp_dashboard_on_this_day_setup();
97-
9891
// WordPress Events and News.
9992
wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress Events and News' ), 'wp_dashboard_events_news' );
10093

0 commit comments

Comments
 (0)