Commit 6d53cc23 authored by Jonathan Desrosiers's avatar Jonathan Desrosiers
Browse files

Themes: Normalize the installed theme path in... 

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: https://core.svn.wordpress.org/branches/5.5@48681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
parent f7d20939

wp-admin/includes/class-theme-installer-skin.php

+3 −1
Original line number Diff line number Diff line
@@ -206,7 +206,9 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { 
		$all_themes         = wp_get_themes( array( 'errors' => null ) );



		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;

			}

wp-includes/version.php

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 *

 * @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.