Skip to content

Commit

Permalink
Upgrade/Install: Remove bundled theme files from $_old_files.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
desrosj committed Nov 16, 2022
1 parent 9a65965 commit 1e267cd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions wp-admin/includes/update-core.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/version.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 1e267cd

Please sign in to comment.