Skip to content

Commit da68b1b

Browse files
sabernhardtsabernhardt
authored
Merge branch 'WordPress:trunk' into 54915-rtl-inputs
2 parents 2520eb7 + 1815f4c commit da68b1b

File tree

15 files changed

+929
-696
lines changed

15 files changed

+929
-696
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
2929
"@wordpress/babel-preset-default": "7.19.1",
3030
"@wordpress/dependency-extraction-webpack-plugin": "4.18.1",
31-
"@wordpress/e2e-test-utils": "10.6.1",
31+
"@wordpress/e2e-test-utils": "10.6.2",
3232
"@wordpress/scripts": "26.6.2",
3333
"autoprefixer": "10.4.14",
3434
"chalk": "5.2.0",
@@ -80,64 +80,64 @@
8080
"@emotion/is-prop-valid": "0.8.8",
8181
"@emotion/memoize": "0.7.4",
8282
"@wordpress/a11y": "3.35.1",
83-
"@wordpress/annotations": "2.35.1",
83+
"@wordpress/annotations": "2.35.2",
8484
"@wordpress/api-fetch": "6.32.1",
8585
"@wordpress/autop": "3.35.1",
8686
"@wordpress/blob": "3.35.1",
87-
"@wordpress/block-directory": "4.12.5",
88-
"@wordpress/block-editor": "12.3.3",
89-
"@wordpress/block-library": "8.12.5",
87+
"@wordpress/block-directory": "4.12.6",
88+
"@wordpress/block-editor": "12.3.4",
89+
"@wordpress/block-library": "8.12.6",
9090
"@wordpress/block-serialization-default-parser": "4.35.1",
91-
"@wordpress/blocks": "12.12.1",
92-
"@wordpress/commands": "0.6.3",
93-
"@wordpress/components": "25.1.3",
91+
"@wordpress/blocks": "12.12.2",
92+
"@wordpress/commands": "0.6.4",
93+
"@wordpress/components": "25.1.4",
9494
"@wordpress/compose": "6.12.1",
95-
"@wordpress/core-commands": "0.4.3",
96-
"@wordpress/core-data": "6.12.3",
97-
"@wordpress/customize-widgets": "4.12.5",
98-
"@wordpress/data": "9.5.1",
99-
"@wordpress/data-controls": "3.4.1",
95+
"@wordpress/core-commands": "0.4.4",
96+
"@wordpress/core-data": "6.12.4",
97+
"@wordpress/customize-widgets": "4.12.6",
98+
"@wordpress/data": "9.5.2",
99+
"@wordpress/data-controls": "3.4.2",
100100
"@wordpress/date": "4.35.1",
101101
"@wordpress/deprecated": "3.35.1",
102102
"@wordpress/dom": "3.35.1",
103103
"@wordpress/dom-ready": "3.35.1",
104-
"@wordpress/edit-post": "7.12.5",
105-
"@wordpress/edit-site": "5.12.5",
106-
"@wordpress/edit-widgets": "5.12.5",
107-
"@wordpress/editor": "13.12.3",
104+
"@wordpress/edit-post": "7.12.6",
105+
"@wordpress/edit-site": "5.12.6",
106+
"@wordpress/edit-widgets": "5.12.6",
107+
"@wordpress/editor": "13.12.4",
108108
"@wordpress/element": "5.12.1",
109109
"@wordpress/escape-html": "2.35.1",
110-
"@wordpress/format-library": "4.12.3",
110+
"@wordpress/format-library": "4.12.4",
111111
"@wordpress/hooks": "3.35.1",
112112
"@wordpress/html-entities": "3.35.1",
113113
"@wordpress/i18n": "4.35.1",
114114
"@wordpress/icons": "9.26.2",
115-
"@wordpress/interface": "5.12.3",
115+
"@wordpress/interface": "5.12.4",
116116
"@wordpress/is-shallow-equal": "4.35.1",
117-
"@wordpress/keyboard-shortcuts": "4.12.1",
117+
"@wordpress/keyboard-shortcuts": "4.12.2",
118118
"@wordpress/keycodes": "3.35.1",
119-
"@wordpress/list-reusable-blocks": "4.12.3",
119+
"@wordpress/list-reusable-blocks": "4.12.4",
120120
"@wordpress/media-utils": "4.26.1",
121-
"@wordpress/notices": "4.3.1",
121+
"@wordpress/notices": "4.3.2",
122122
"@wordpress/nux": "6.0.0",
123-
"@wordpress/plugins": "6.3.3",
124-
"@wordpress/preferences": "3.12.3",
123+
"@wordpress/plugins": "6.3.4",
124+
"@wordpress/preferences": "3.12.4",
125125
"@wordpress/preferences-persistence": "1.27.1",
126126
"@wordpress/primitives": "3.33.1",
127127
"@wordpress/priority-queue": "2.35.1",
128128
"@wordpress/private-apis": "0.17.1",
129129
"@wordpress/redux-routine": "4.35.1",
130-
"@wordpress/reusable-blocks": "4.12.3",
131-
"@wordpress/rich-text": "6.12.1",
130+
"@wordpress/reusable-blocks": "4.12.4",
131+
"@wordpress/rich-text": "6.12.2",
132132
"@wordpress/router": "0.4.1",
133-
"@wordpress/server-side-render": "4.12.3",
133+
"@wordpress/server-side-render": "4.12.4",
134134
"@wordpress/shortcode": "3.35.1",
135135
"@wordpress/style-engine": "1.18.1",
136136
"@wordpress/token-list": "2.35.1",
137137
"@wordpress/url": "3.36.1",
138-
"@wordpress/viewport": "5.12.1",
138+
"@wordpress/viewport": "5.12.2",
139139
"@wordpress/warning": "2.35.1",
140-
"@wordpress/widgets": "3.12.3",
140+
"@wordpress/widgets": "3.12.4",
141141
"@wordpress/wordcount": "3.35.1",
142142
"backbone": "1.4.1",
143143
"clipboard": "2.0.11",

‎src/wp-admin/includes/class-wp-automatic-updater.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ public function is_vcs_checkout( $context ) {
148148
}
149149

150150
$check_dirs = array_unique( $check_dirs );
151+
$checkout = false;
151152

152153
// Search all directories we've found for evidence of version control.
153154
foreach ( $vcs_dirs as $vcs_dir ) {

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,15 @@ function bulk_edit_posts( $post_data = null ) {
668668
// Prevent wp_insert_post() from overwriting post format with the old data.
669669
unset( $post_data['tax_input']['post_format'] );
670670

671+
// Reset post date of scheduled post to be published.
672+
if (
673+
in_array( $post->post_status, array( 'future', 'draft' ), true ) &&
674+
'publish' === $post_data['post_status']
675+
) {
676+
$post_data['post_date'] = current_time( 'mysql' );
677+
$post_data['post_date_gmt'] = '';
678+
}
679+
671680
$post_id = wp_update_post( $post_data );
672681
update_post_meta( $post_id, '_edit_last', get_current_user_id() );
673682
$updated[] = $post_id;

‎src/wp-includes/assets/script-loader-packages.min.php‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/wp-includes/blocks/footnotes.php‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,17 @@ function render_block_core_footnotes( $attributes, $content, $block ) {
5959
* Registers the `core/footnotes` block on the server.
6060
*/
6161
function register_block_core_footnotes() {
62-
register_post_meta(
63-
'post',
64-
'footnotes',
65-
array(
66-
'show_in_rest' => true,
67-
'single' => true,
68-
'type' => 'string',
69-
)
70-
);
62+
foreach ( array( 'post', 'page' ) as $post_type ) {
63+
register_post_meta(
64+
$post_type,
65+
'footnotes',
66+
array(
67+
'show_in_rest' => true,
68+
'single' => true,
69+
'type' => 'string',
70+
)
71+
);
72+
}
7173
register_block_type_from_metadata(
7274
__DIR__ . '/footnotes',
7375
array(

‎src/wp-includes/blocks/social-link.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ function render_block_core_social_link( $attributes, $content, $block ) {
4747
$icon = block_core_social_link_get_icon( $service );
4848
$wrapper_attributes = get_block_wrapper_attributes(
4949
array(
50-
'class' => esc_attr( 'wp-social-link wp-social-link-' . $service . block_core_social_link_get_color_classes( $block->context ) ),
51-
'style' => esc_attr( block_core_social_link_get_color_styles( $block->context ) ),
50+
'class' => 'wp-social-link wp-social-link-' . $service . block_core_social_link_get_color_classes( $block->context ),
51+
'style' => block_core_social_link_get_color_styles( $block->context ),
5252
)
5353
);
5454

‎src/wp-includes/class-wp-http-curl.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ public function request( $url, $args = array() ) {
7878
'headers' => array(),
7979
'body' => null,
8080
'cookies' => array(),
81+
'decompress' => false,
82+
'stream' => false,
83+
'filename' => null,
8184
);
8285

8386
$parsed_args = wp_parse_args( $args, $defaults );

‎src/wp-includes/class-wp-http-streams.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public function request( $url, $args = array() ) {
3737
'headers' => array(),
3838
'body' => null,
3939
'cookies' => array(),
40+
'decompress' => false,
41+
'stream' => false,
42+
'filename' => null,
4043
);
4144

4245
$parsed_args = wp_parse_args( $args, $defaults );

‎src/wp-includes/deprecated.php‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5290,3 +5290,79 @@ function wp_global_styles_render_svg_filters() {
52905290
echo $filters;
52915291
}
52925292
}
5293+
5294+
/**
5295+
* Build an array with CSS classes and inline styles defining the colors
5296+
* which will be applied to the navigation markup in the front-end.
5297+
*
5298+
* @since 5.9.0
5299+
* @deprecated 6.3.0 This was removed from the Navigation Submenu block in favour of `wp_apply_colors_support()`.
5300+
* `wp_apply_colors_support()` returns an array with similar class and style values,
5301+
* but with different keys: `class` and `style`.
5302+
*
5303+
* @param array $context Navigation block context.
5304+
* @param array $attributes Block attributes.
5305+
* @param bool $is_sub_menu Whether the block is a sub-menu.
5306+
* @return array Colors CSS classes and inline styles.
5307+
*/
5308+
function block_core_navigation_submenu_build_css_colors( $context, $attributes, $is_sub_menu = false ) {
5309+
_deprecated_function( __FUNCTION__, '6.3.0' );
5310+
$colors = array(
5311+
'css_classes' => array(),
5312+
'inline_styles' => '',
5313+
);
5314+
5315+
// Text color.
5316+
$named_text_color = null;
5317+
$custom_text_color = null;
5318+
5319+
if ( $is_sub_menu && array_key_exists( 'customOverlayTextColor', $context ) ) {
5320+
$custom_text_color = $context['customOverlayTextColor'];
5321+
} elseif ( $is_sub_menu && array_key_exists( 'overlayTextColor', $context ) ) {
5322+
$named_text_color = $context['overlayTextColor'];
5323+
} elseif ( array_key_exists( 'customTextColor', $context ) ) {
5324+
$custom_text_color = $context['customTextColor'];
5325+
} elseif ( array_key_exists( 'textColor', $context ) ) {
5326+
$named_text_color = $context['textColor'];
5327+
} elseif ( isset( $context['style']['color']['text'] ) ) {
5328+
$custom_text_color = $context['style']['color']['text'];
5329+
}
5330+
5331+
// If has text color.
5332+
if ( ! is_null( $named_text_color ) ) {
5333+
// Add the color class.
5334+
array_push( $colors['css_classes'], 'has-text-color', sprintf( 'has-%s-color', $named_text_color ) );
5335+
} elseif ( ! is_null( $custom_text_color ) ) {
5336+
// Add the custom color inline style.
5337+
$colors['css_classes'][] = 'has-text-color';
5338+
$colors['inline_styles'] .= sprintf( 'color: %s;', $custom_text_color );
5339+
}
5340+
5341+
// Background color.
5342+
$named_background_color = null;
5343+
$custom_background_color = null;
5344+
5345+
if ( $is_sub_menu && array_key_exists( 'customOverlayBackgroundColor', $context ) ) {
5346+
$custom_background_color = $context['customOverlayBackgroundColor'];
5347+
} elseif ( $is_sub_menu && array_key_exists( 'overlayBackgroundColor', $context ) ) {
5348+
$named_background_color = $context['overlayBackgroundColor'];
5349+
} elseif ( array_key_exists( 'customBackgroundColor', $context ) ) {
5350+
$custom_background_color = $context['customBackgroundColor'];
5351+
} elseif ( array_key_exists( 'backgroundColor', $context ) ) {
5352+
$named_background_color = $context['backgroundColor'];
5353+
} elseif ( isset( $context['style']['color']['background'] ) ) {
5354+
$custom_background_color = $context['style']['color']['background'];
5355+
}
5356+
5357+
// If has background color.
5358+
if ( ! is_null( $named_background_color ) ) {
5359+
// Add the background-color class.
5360+
array_push( $colors['css_classes'], 'has-background', sprintf( 'has-%s-background-color', $named_background_color ) );
5361+
} elseif ( ! is_null( $custom_background_color ) ) {
5362+
// Add the custom background-color inline style.
5363+
$colors['css_classes'][] = 'has-background';
5364+
$colors['inline_styles'] .= sprintf( 'background-color: %s;', $custom_background_color );
5365+
}
5366+
5367+
return $colors;
5368+
}

0 commit comments

Comments
 (0)