Skip to content

Commit 880026e

Browse files
DarkMatter-999DarkMatter-999
committed
Merge branch 'trunk' into '57170-fix-invalid-menu-item-parent'
2 parents a371834 + 6bc94ef commit 880026e

File tree

13 files changed

+529
-653
lines changed

13 files changed

+529
-653
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
3030
"@wordpress/babel-preset-default": "8.19.1",
3131
"@wordpress/dependency-extraction-webpack-plugin": "6.19.1",
32-
"@wordpress/e2e-test-utils": "11.19.1",
3332
"@wordpress/e2e-test-utils-playwright": "1.19.1",
3433
"@wordpress/prettier-config": "4.19.1",
3534
"@wordpress/scripts": "30.12.1",
@@ -77,72 +76,72 @@
7776
},
7877
"dependencies": {
7978
"@wordpress/a11y": "4.19.1",
80-
"@wordpress/annotations": "3.19.1",
81-
"@wordpress/api-fetch": "7.19.1",
79+
"@wordpress/annotations": "3.19.2",
80+
"@wordpress/api-fetch": "7.19.2",
8281
"@wordpress/autop": "4.19.1",
8382
"@wordpress/blob": "4.19.1",
84-
"@wordpress/block-directory": "5.19.6",
85-
"@wordpress/block-editor": "14.14.5",
86-
"@wordpress/block-library": "9.19.5",
83+
"@wordpress/block-directory": "5.19.7",
84+
"@wordpress/block-editor": "14.14.6",
85+
"@wordpress/block-library": "9.19.6",
8786
"@wordpress/block-serialization-default-parser": "5.19.1",
88-
"@wordpress/blocks": "14.8.1",
89-
"@wordpress/commands": "1.19.3",
90-
"@wordpress/components": "29.5.3",
91-
"@wordpress/compose": "7.19.1",
92-
"@wordpress/core-commands": "1.19.5",
93-
"@wordpress/core-data": "7.19.5",
94-
"@wordpress/customize-widgets": "5.19.5",
95-
"@wordpress/data": "10.19.1",
96-
"@wordpress/data-controls": "4.19.1",
97-
"@wordpress/dataviews": "4.15.3",
87+
"@wordpress/blocks": "14.8.2",
88+
"@wordpress/commands": "1.19.4",
89+
"@wordpress/components": "29.5.4",
90+
"@wordpress/compose": "7.19.2",
91+
"@wordpress/core-commands": "1.19.6",
92+
"@wordpress/core-data": "7.19.6",
93+
"@wordpress/customize-widgets": "5.19.6",
94+
"@wordpress/data": "10.19.2",
95+
"@wordpress/data-controls": "4.19.2",
96+
"@wordpress/dataviews": "4.15.4",
9897
"@wordpress/date": "5.19.1",
9998
"@wordpress/deprecated": "4.19.1",
100-
"@wordpress/dom": "4.19.1",
99+
"@wordpress/dom": "4.19.2",
101100
"@wordpress/dom-ready": "4.19.1",
102-
"@wordpress/edit-post": "8.19.6",
103-
"@wordpress/edit-site": "6.19.6",
104-
"@wordpress/edit-widgets": "6.19.5",
105-
"@wordpress/editor": "14.19.6",
101+
"@wordpress/edit-post": "8.19.7",
102+
"@wordpress/edit-site": "6.19.7",
103+
"@wordpress/edit-widgets": "6.19.6",
104+
"@wordpress/editor": "14.19.7",
106105
"@wordpress/element": "6.19.1",
107106
"@wordpress/escape-html": "3.19.1",
108-
"@wordpress/fields": "0.11.5",
109-
"@wordpress/format-library": "5.19.5",
107+
"@wordpress/fields": "0.11.6",
108+
"@wordpress/format-library": "5.19.6",
110109
"@wordpress/hooks": "4.19.1",
111110
"@wordpress/html-entities": "4.19.1",
112111
"@wordpress/i18n": "5.19.1",
113112
"@wordpress/icons": "10.19.1",
114113
"@wordpress/interactivity": "6.19.1",
115114
"@wordpress/interactivity-router": "2.19.1",
116-
"@wordpress/interface": "9.4.3",
115+
"@wordpress/interface": "9.4.4",
117116
"@wordpress/is-shallow-equal": "5.19.1",
118-
"@wordpress/keyboard-shortcuts": "5.19.1",
117+
"@wordpress/keyboard-shortcuts": "5.19.2",
119118
"@wordpress/keycodes": "4.19.1",
120-
"@wordpress/list-reusable-blocks": "5.19.3",
121-
"@wordpress/media-utils": "5.19.1",
122-
"@wordpress/notices": "5.19.1",
123-
"@wordpress/nux": "9.19.3",
124-
"@wordpress/patterns": "2.19.5",
125-
"@wordpress/plugins": "7.19.3",
126-
"@wordpress/preferences": "4.19.3",
127-
"@wordpress/preferences-persistence": "2.19.1",
119+
"@wordpress/list-reusable-blocks": "5.19.4",
120+
"@wordpress/media-utils": "5.19.2",
121+
"@wordpress/notices": "5.19.2",
122+
"@wordpress/nux": "9.19.4",
123+
"@wordpress/patterns": "2.19.6",
124+
"@wordpress/plugins": "7.19.4",
125+
"@wordpress/preferences": "4.19.4",
126+
"@wordpress/preferences-persistence": "2.19.2",
128127
"@wordpress/primitives": "4.19.1",
129128
"@wordpress/priority-queue": "3.19.1",
130129
"@wordpress/private-apis": "1.19.1",
131130
"@wordpress/redux-routine": "5.19.1",
132-
"@wordpress/reusable-blocks": "5.19.5",
133-
"@wordpress/rich-text": "7.19.1",
134-
"@wordpress/router": "1.19.1",
135-
"@wordpress/server-side-render": "5.19.3",
131+
"@wordpress/reusable-blocks": "5.19.6",
132+
"@wordpress/rich-text": "7.19.2",
133+
"@wordpress/router": "1.19.2",
134+
"@wordpress/server-side-render": "5.19.4",
136135
"@wordpress/shortcode": "4.19.1",
137136
"@wordpress/style-engine": "2.19.1",
138-
"@wordpress/sync": "1.19.1",
137+
"@wordpress/sync": "1.19.2",
139138
"@wordpress/token-list": "3.19.1",
140139
"@wordpress/undo-manager": "1.19.1",
141-
"@wordpress/upload-media": "0.4.3",
142-
"@wordpress/url": "4.19.1",
143-
"@wordpress/viewport": "6.19.1",
140+
"@wordpress/upload-media": "0.4.4",
141+
"@wordpress/url": "4.19.2",
142+
"@wordpress/viewport": "6.19.2",
144143
"@wordpress/warning": "3.19.1",
145-
"@wordpress/widgets": "4.19.5",
144+
"@wordpress/widgets": "4.19.6",
146145
"@wordpress/wordcount": "4.19.1",
147146
"backbone": "1.6.0",
148147
"clipboard": "2.0.11",

‎src/readme.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h2>System Requirements</h2>
5858

5959
<h3>Recommendations</h3>
6060
<ul>
61-
<li><a href="https://www.php.net/">PHP</a> version <strong>7.4</strong> or greater.</li>
61+
<li><a href="https://www.php.net/">PHP</a> version <strong>8.3</strong> or greater.</li>
6262
<li><a href="https://www.mysql.com/">MySQL</a> version <strong>8.0</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.6</strong> or greater.</li>
6363
<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
6464
<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ function populate_options( array $options = array() ) {
446446
'moderation_keys' => '',
447447
'active_plugins' => array(),
448448
'category_base' => '',
449-
'ping_sites' => 'http://rpc.pingomatic.com/',
449+
'ping_sites' => 'https://rpc.pingomatic.com/',
450450
'comment_max_links' => 2,
451451
'gmt_offset' => $gmt_offset,
452452

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,11 @@ function upgrade_all() {
881881
if ( $wp_current_db_version < 58975 ) {
882882
upgrade_670();
883883
}
884+
885+
if ( $wp_current_db_version < 60421 ) {
886+
upgrade_682();
887+
}
888+
884889
maybe_disable_link_manager();
885890

886891
maybe_disable_automattic_widgets();
@@ -2439,6 +2444,42 @@ function upgrade_670() {
24392444
wp_set_options_autoload( $options, false );
24402445
}
24412446
}
2447+
2448+
/**
2449+
* Executes changes made in WordPress 6.8.2.
2450+
*
2451+
* @ignore
2452+
* @since 6.8.2
2453+
*
2454+
* @global int $wp_current_db_version The old (current) database version.
2455+
*/
2456+
function upgrade_682() {
2457+
global $wp_current_db_version;
2458+
2459+
if ( $wp_current_db_version < 60421 ) {
2460+
// Upgrade Ping-O-Matic and Twingly to use HTTPS.
2461+
$ping_sites_value = get_option( 'ping_sites' );
2462+
$ping_sites_value = explode( "\n", $ping_sites_value );
2463+
$ping_sites_value = array_map(
2464+
function ( $url ) {
2465+
$url = trim( $url );
2466+
$url = sanitize_url( $url );
2467+
if (
2468+
str_ends_with( trailingslashit( $url ), '://rpc.pingomatic.com/' )
2469+
|| str_ends_with( trailingslashit( $url ), '://rpc.twingly.com/' )
2470+
) {
2471+
$url = set_url_scheme( $url, 'https' );
2472+
}
2473+
return $url;
2474+
},
2475+
$ping_sites_value
2476+
);
2477+
$ping_sites_value = array_filter( $ping_sites_value );
2478+
$ping_sites_value = implode( "\n", $ping_sites_value );
2479+
update_option( 'ping_sites', $ping_sites_value );
2480+
}
2481+
}
2482+
24422483
/**
24432484
* Executes network-level upgrade routines.
24442485
*

‎src/wp-admin/nav-menus.php‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,14 +1122,12 @@ function wp_nav_menu_max_depth( $classes ) {
11221122
<p><?php echo $starter_copy; ?></p>
11231123
</div>
11241124

1125-
<?php if ( ! $add_new_screen ) : ?>
1126-
<div id="nav-menu-bulk-actions-top" class="bulk-actions" <?php echo $hide_style; ?>>
1127-
<label class="bulk-select-button" for="bulk-select-switcher-top">
1128-
<input type="checkbox" id="bulk-select-switcher-top" name="bulk-select-switcher-top" class="bulk-select-switcher">
1129-
<span class="bulk-select-button-label"><?php _e( 'Bulk Select' ); ?></span>
1130-
</label>
1131-
</div>
1132-
<?php endif; ?>
1125+
<div id="nav-menu-bulk-actions-top" class="bulk-actions" <?php echo $hide_style; ?>>
1126+
<label class="bulk-select-button" for="bulk-select-switcher-top">
1127+
<input type="checkbox" id="bulk-select-switcher-top" name="bulk-select-switcher-top" class="bulk-select-switcher">
1128+
<span class="bulk-select-button-label"><?php _e( 'Bulk Select' ); ?></span>
1129+
</label>
1130+
</div>
11331131

11341132
<?php
11351133
if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {

‎src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
</header><!-- .entry-header -->
4343

4444
<?php
45+
/** This filter is documented in wp-includes/post-template.php */
4546
$content = apply_filters( 'the_content', get_the_content() );
4647
$audio = false;
4748

‎src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
</header><!-- .entry-header -->
4343

4444
<?php
45+
/** This filter is documented in wp-includes/post-template.php */
4546
$content = apply_filters( 'the_content', get_the_content() );
4647
$video = false;
4748

‎src/wp-content/themes/twentytwentyfive/functions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function twentytwentyfive_post_format_setup() {
3434
* @return void
3535
*/
3636
function twentytwentyfive_editor_style() {
37-
add_editor_style( get_parent_theme_file_uri( 'assets/css/editor-style.css' ) );
37+
add_editor_style( 'assets/css/editor-style.css' );
3838
}
3939
endif;
4040
add_action( 'after_setup_theme', 'twentytwentyfive_editor_style' );

0 commit comments

Comments
 (0)