From 1e267cdbf132045be59bd19b4a5f3f834682b90d Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Wed, 16 Nov 2022 15:43:10 +0000 Subject: [PATCH] Upgrade/Install: Remove bundled theme files from `$_old_files`. Because themes are updated independently of Core updates, any deleted files from bundled themes should not be included in the `$_old_files` list. Any file included in this list is deleted on update, which could cause problems for sites with a given theme active if the removed files were required in earlier versions of that theme and that theme is not updated at the same time. Props desrosj, costdev, SergeyBiryukov. Fixes #56936. Built from https://develop.svn.wordpress.org/trunk@54849 git-svn-id: https://core.svn.wordpress.org/trunk@54401 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/update-core.php | 6 ++---- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 22b32012b6..20a7390149 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -10,6 +10,8 @@ /** * Stores files to be deleted. * + * Bundled theme files should not be included in this list. + * * @since 2.7.0 * * @global array $_old_files @@ -843,11 +845,7 @@ 'wp-includes/blocks/tag-cloud/editor.min.css', 'wp-includes/blocks/tag-cloud/editor-rtl.css', 'wp-includes/blocks/tag-cloud/editor-rtl.min.css', - // 6.0 - 'wp-content/themes/twentytwentytwo/assets/fonts/LICENSE.md', // 6.1 - 'wp-content/themes/twentytwentyone/assets/sass/05-blocks/spacer/_style.scss', - 'wp-content/themes/twentytwentyone/assets/sass/05-blocks/spacer', 'wp-includes/blocks/post-comments.php', 'wp-includes/blocks/post-comments/block.json', 'wp-includes/blocks/post-comments/editor.css', diff --git a/wp-includes/version.php b/wp-includes/version.php index 562fc49111..345a1dba0a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54848'; +$wp_version = '6.2-alpha-54849'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.