Skip to content

Commit 40faf86

Browse files
authored
Merge branch 'trunk' into add/visual-regression-tests-admin-reskin
2 parents 40e9c25 + 039e100 commit 40faf86

40 files changed

Lines changed: 100 additions & 66 deletions

src/wp-admin/css/common.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@
129129
padding: 0;
130130
position: absolute;
131131
width: 1px;
132-
word-wrap: normal !important; /* many screen reader and browser combinations announce broken words as they would appear visually */
132+
/* Many screen reader and browser combinations announce broken words as they would appear visually. */
133+
word-wrap: normal !important;
134+
word-break: normal !important;
133135
}
134136

135137
.button .screen-reader-text {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2686,7 +2686,9 @@ body.adding-widget .add-new-widget:before,
26862686
padding: 0;
26872687
position: absolute;
26882688
width: 1px;
2689+
/* Many screen reader and browser combinations announce broken words as they would appear visually. */
26892690
word-wrap: normal !important;
2691+
word-break: normal !important;
26902692
}
26912693

26922694
#available-widgets .customize-section-title button,

src/wp-admin/css/install.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,9 @@ body.language-chooser {
356356
padding: 0;
357357
position: absolute;
358358
width: 1px;
359+
/* Many screen reader and browser combinations announce broken words as they would appear visually. */
359360
word-wrap: normal !important;
361+
word-break: normal !important;
360362
}
361363

362364
.spinner {

src/wp-admin/css/login.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,9 @@ body.interim-login {
413413
padding: 0;
414414
position: absolute;
415415
width: 1px;
416-
word-wrap: normal !important; /* many screen reader and browser combinations announce broken words as they would appear visually */
416+
/* Many screen reader and browser combinations announce broken words as they would appear visually. */
417+
word-wrap: normal !important;
418+
word-break: normal !important;
417419
}
418420

419421
/* Hide the Edge "reveal password" native button */

src/wp-admin/edit-comments.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,13 @@
319319
|| isset( $_REQUEST['unspammed'] )
320320
|| isset( $_REQUEST['same'] )
321321
) {
322-
$approved = isset( $_REQUEST['approved'] ) ? (int) $_REQUEST['approved'] : 0;
323-
$deleted = isset( $_REQUEST['deleted'] ) ? (int) $_REQUEST['deleted'] : 0;
324-
$trashed = isset( $_REQUEST['trashed'] ) ? (int) $_REQUEST['trashed'] : 0;
325-
$untrashed = isset( $_REQUEST['untrashed'] ) ? (int) $_REQUEST['untrashed'] : 0;
326-
$spammed = isset( $_REQUEST['spammed'] ) ? (int) $_REQUEST['spammed'] : 0;
327-
$unspammed = isset( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
328-
$same = isset( $_REQUEST['same'] ) ? (int) $_REQUEST['same'] : 0;
322+
$approved = (int) ( $_REQUEST['approved'] ?? 0 );
323+
$deleted = (int) ( $_REQUEST['deleted'] ?? 0 );
324+
$trashed = (int) ( $_REQUEST['trashed'] ?? 0 );
325+
$untrashed = (int) ( $_REQUEST['untrashed'] ?? 0 );
326+
$spammed = (int) ( $_REQUEST['spammed'] ?? 0 );
327+
$unspammed = (int) ( $_REQUEST['unspammed'] ?? 0 );
328+
$same = (int) ( $_REQUEST['same'] ?? 0 );
329329

330330
if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
331331
if ( $approved > 0 ) {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ function wp_ajax_get_tagcloud() {
12411241
*
12421242
* @since 3.1.0
12431243
*
1244-
* @global int $post_id
1244+
* @global int $post_id Post ID.
12451245
*
12461246
* @param string $action Action to perform.
12471247
*/
@@ -2353,9 +2353,9 @@ function wp_ajax_widgets_order() {
23532353
*
23542354
* @since 3.1.0
23552355
*
2356-
* @global array $wp_registered_widgets
2357-
* @global array $wp_registered_widget_controls
2358-
* @global array $wp_registered_widget_updates
2356+
* @global array $wp_registered_widgets Registered widgets.
2357+
* @global array $wp_registered_widget_controls Registered widget controls.
2358+
* @global array $wp_registered_widget_updates Registered widget updates.
23592359
*/
23602360
function wp_ajax_save_widget() {
23612361
global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates;
@@ -2462,7 +2462,7 @@ function wp_ajax_save_widget() {
24622462
*
24632463
* @since 3.9.0
24642464
*
2465-
* @global WP_Customize_Manager $wp_customize
2465+
* @global WP_Customize_Manager $wp_customize Customizer manager object.
24662466
*/
24672467
function wp_ajax_update_widget() {
24682468
global $wp_customize;
@@ -3588,7 +3588,7 @@ function wp_ajax_get_revision_diffs() {
35883588
*
35893589
* @since 3.8.0
35903590
*
3591-
* @global array $_wp_admin_css_colors
3591+
* @global array $_wp_admin_css_colors Registered admin CSS color schemes.
35923592
*/
35933593
function wp_ajax_save_user_color_scheme() {
35943594
global $_wp_admin_css_colors;
@@ -3617,8 +3617,8 @@ function wp_ajax_save_user_color_scheme() {
36173617
*
36183618
* @since 3.9.0
36193619
*
3620-
* @global array $themes_allowedtags
3621-
* @global array $theme_field_defaults
3620+
* @global array $themes_allowedtags Allowed HTML tags for theme descriptions.
3621+
* @global array $theme_field_defaults Default theme fields.
36223622
*/
36233623
function wp_ajax_query_themes() {
36243624
global $themes_allowedtags, $theme_field_defaults;
@@ -3750,8 +3750,8 @@ function wp_ajax_query_themes() {
37503750
*
37513751
* @global WP_Post $post Global post object.
37523752
* @global WP_Embed $wp_embed WordPress Embed object.
3753-
* @global WP_Scripts $wp_scripts
3754-
* @global int $content_width
3753+
* @global WP_Scripts $wp_scripts Script dependencies object.
3754+
* @global int $content_width Shared post content width.
37553755
*/
37563756
function wp_ajax_parse_embed() {
37573757
global $post, $wp_embed, $content_width;
@@ -3891,7 +3891,7 @@ function wp_ajax_parse_embed() {
38913891
* @since 4.0.0
38923892
*
38933893
* @global WP_Post $post Global post object.
3894-
* @global WP_Scripts $wp_scripts
3894+
* @global WP_Scripts $wp_scripts Script dependencies object.
38953895
*/
38963896
function wp_ajax_parse_media_shortcode() {
38973897
global $post, $wp_scripts;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function upgrade_strings() {
4848
* @since 2.8.0
4949
*
5050
* @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
51-
* @global callable $_wp_filesystem_direct_method
51+
* @global callable $_wp_filesystem_direct_method Filesystem direct method callback.
5252
*
5353
* @param object $current Response object for whether WordPress is current.
5454
* @param array $args {

src/wp-admin/includes/class-custom-image-header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public function take_action() {
268268
*
269269
* @since 3.0.0
270270
*
271-
* @global array $_wp_default_headers
271+
* @global array $_wp_default_headers Default headers registered for themes.
272272
*/
273273
public function process_default_headers() {
274274
global $_wp_default_headers;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ public function current_after( $response, $theme ) {
746746
*
747747
* @since 2.8.0
748748
*
749-
* @global WP_Filesystem_Base $wp_filesystem Subclass
749+
* @global WP_Filesystem_Base $wp_filesystem Filesystem subclass.
750750
*
751751
* @param bool $removed
752752
* @param string $local_destination

src/wp-admin/includes/class-walker-nav-menu-checklist.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public function end_lvl( &$output, $depth = 0, $args = null ) {
6464
* @since 5.9.0 Renamed `$item` to `$data_object` and `$id` to `$current_object_id`
6565
* to match parent class for PHP 8 named parameter support.
6666
*
67-
* @global int $_nav_menu_placeholder
68-
* @global int|string $nav_menu_selected_id
67+
* @global int $_nav_menu_placeholder A placeholder for the nav menu item ID.
68+
* @global int|string $nav_menu_selected_id The ID of the selected nav menu.
6969
*
7070
* @param string $output Used to append additional content (passed by reference).
7171
* @param WP_Post $data_object Menu item data object.

0 commit comments

Comments
 (0)