Skip to content

Commit 51c7bd3

Browse files
authored
Merge branch 'trunk' into fix-taxonomy-tabs
2 parents 720c453 + ef55bd4 commit 51c7bd3

11 files changed

Lines changed: 9 additions & 26 deletions

File tree

.github/workflows/reusable-end-to-end-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100

101101
- name: Install Playwright browsers
102102
if: ${{ inputs.install-playwright }}
103-
run: npx playwright install --with-deps
103+
run: npx playwright install --with-deps chromium
104104

105105
- name: Build WordPress
106106
run: npm run build

.github/workflows/reusable-performance-test-v2.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,6 @@ jobs:
227227
- name: Deactivate WordPress Importer plugin
228228
run: npm run env:cli -- plugin deactivate wordpress-importer --path="/var/www/${LOCAL_DIR}"
229229

230-
- name: Update permalink structure
231-
run: npm run env:cli -- rewrite structure '/%year%/%monthnum%/%postname%/' --path="/var/www/${LOCAL_DIR}"
232-
233230
- name: Install additional languages
234231
run: |
235232
npm run env:cli -- language core install de_DE --path="/var/www/${LOCAL_DIR}"

.github/workflows/reusable-performance.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ jobs:
203203
- name: Deactivate WordPress Importer plugin
204204
run: npm run env:cli -- plugin deactivate wordpress-importer --path="/var/www/${LOCAL_DIR}"
205205

206-
- name: Update permalink structure
207-
run: npm run env:cli -- rewrite structure '/%year%/%monthnum%/%postname%/' --path="/var/www/${LOCAL_DIR}"
208-
209206
- name: Install additional languages
210207
run: |
211208
npm run env:cli -- language core install de_DE --path="/var/www/${LOCAL_DIR}"

src/wp-admin/css/common.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,11 +1575,11 @@ div.error.notice-alt {
15751575

15761576
.notice-info {
15771577
border-left-color: #3858e9;
1578-
background-color: transparent;
1578+
background-color: #fff;
15791579
}
15801580

15811581
.notice-info.notice-alt {
1582-
background-color: transparent;
1582+
background-color: #fff;
15831583
}
15841584

15851585
#plugin-information-footer .update-now:not(.button-disabled):before {

src/wp-admin/css/dashboard.css

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -720,14 +720,6 @@ body #dashboard-widgets .postbox form .submit {
720720
margin-bottom: 10px;
721721
}
722722

723-
#dashboard_right_now .inside {
724-
padding: 0;
725-
}
726-
727-
#dashboard_right_now .main {
728-
padding: 16px 16px 11px;
729-
}
730-
731723
#dashboard_right_now .main p {
732724
margin: 0;
733725
}

src/wp-admin/css/login.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ p {
4949
margin-top: 0;
5050
margin-left: 0;
5151
margin-bottom: 20px;
52-
background-color: transparent;
52+
background-color: #fff;
5353
word-wrap: break-word;
5454
}
5555

src/wp-admin/includes/class-wp-media-list-table.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,8 @@ public function column_title( $post ) {
490490

491491
if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
492492
$link_start = sprintf(
493-
'<a href="%s" aria-label="%s">',
493+
'<a href="%s">',
494494
get_edit_post_link( $post->ID ),
495-
/* translators: %s: Attachment title. */
496-
esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $title ) )
497495
);
498496
$link_end = '</a>';
499497
}

src/wp-admin/includes/class-wp-posts-list-table.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,10 +1138,8 @@ public function column_title( $post ) {
11381138

11391139
if ( $can_edit_post && 'trash' !== $post->post_status ) {
11401140
printf(
1141-
'<a class="row-title" href="%s" aria-label="%s">%s%s</a>',
1141+
'<a class="row-title" href="%s">%s%s</a>',
11421142
get_edit_post_link( $post->ID ),
1143-
/* translators: %s: Post title. */
1144-
esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $title ) ),
11451143
$pad,
11461144
$title
11471145
);

src/wp-includes/block-template-utils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function get_allowed_block_template_part_areas() {
103103
'area' => WP_TEMPLATE_PART_AREA_NAVIGATION_OVERLAY,
104104
'label' => _x( 'Navigation Overlay', 'template part area' ),
105105
'description' => __(
106-
'The Navigation Overlay template defines a full-screen overlay area that typically contains navigation links and can be toggled on and off.'
106+
'The Navigation Overlay template defines an overlay area that typically contains navigation links and can be toggled open and closed.'
107107
),
108108
'icon' => 'navigation-overlay',
109109
'area_tag' => 'div',

src/wp-includes/user.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ function get_users( $args = array() ) {
894894
* 'display_name', 'post_count', 'ID', 'meta_value', 'user_login'. Default 'name'.
895895
* @type string $order Sorting direction for $orderby. Accepts 'ASC', 'DESC'. Default 'ASC'.
896896
* @type int $number Maximum users to return or display. Default empty (all users).
897-
* @type bool $exclude_admin Whether to exclude the 'admin' account, if it exists. Default false.
897+
* @type bool $exclude_admin Whether to exclude the 'admin' account, if it exists. Default true.
898898
* @type bool $show_fullname Whether to show the user's full name. Default false.
899899
* @type string $feed If not empty, show a link to the user's feed and use this text as the alt
900900
* parameter of the link. Default empty.

0 commit comments

Comments
 (0)