WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Themes: Normalize the installed theme path in `Theme_Installer_Skin::do_overwrite()` before comparing with the uploaded theme. 

This ensures that the data for the currently installed theme is picked up properly when uploading a theme update on Windows.

Follow-up to [48390].

Props bobbingwide, wpamitkumar, mukesh27.
Merges [48913] to the 5.5 branch.
Fixes #51182.
Built from https://develop.svn.wordpress.org/branches/5.5@48919


git-svn-id: http://core.svn.wordpress.org/branches/5.5@48681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2020-08-31 18:31:09 +00:00
parent f5a90352b3
commit 22ceef8ed5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/class-theme-installer-skin.php
View File

@ -206,7 +206,9 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
$all_themes = wp_get_themes( array( 'errors' => null ) ); $all_themes = wp_get_themes( array( 'errors' => null ) );
foreach ( $all_themes as $theme ) { foreach ( $all_themes as $theme ) {
if ( rtrim( $theme->get_stylesheet_directory(), '/' ) !== $folder ) { $stylesheet_dir = wp_normalize_path( $theme->get_stylesheet_directory() );
if ( rtrim( $stylesheet_dir, '/' ) !== $folder ) {
continue; continue;
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5.1-RC1-48917'; $wp_version = '5.5.1-RC1-48919';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.