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

Media: Fix deletion of files on Windows. 

`wp_delete_file_from_directory()` should always normalize file paths before comparing.

Props tonybogdanov, SergeyBiryukov.
Fixes #47185.
Built from https://develop.svn.wordpress.org/trunk@45352


git-svn-id: http://core.svn.wordpress.org/trunk@45163 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-05-17 13:30:02 +00:00
parent 550bc5cad2
commit ea8078f73c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/functions.php
View File

@ -6282,13 +6282,21 @@ function wp_delete_file( $file ) {
*/ */
function wp_delete_file_from_directory( $file, $directory ) { function wp_delete_file_from_directory( $file, $directory ) {
if ( wp_is_stream( $file ) ) { if ( wp_is_stream( $file ) ) {
$real_file = wp_normalize_path( $file ); $real_file = $file;
$real_directory = wp_normalize_path( $directory ); $real_directory = $directory;
} else { } else {
$real_file = realpath( wp_normalize_path( $file ) ); $real_file = realpath( wp_normalize_path( $file ) );
$real_directory = realpath( wp_normalize_path( $directory ) ); $real_directory = realpath( wp_normalize_path( $directory ) );
} }
if ( false !== $real_file ) {
$real_file = wp_normalize_path( $real_file );
}
if ( false !== $real_directory ) {
$real_directory = wp_normalize_path( $real_directory );
}
if ( false === $real_file || false === $real_directory || strpos( $real_file, trailingslashit( $real_directory ) ) !== 0 ) { if ( false === $real_file || false === $real_directory || strpos( $real_file, trailingslashit( $real_directory ) ) !== 0 ) {
return false; return false;
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45350'; $wp_version = '5.3-alpha-45352';
/** /**
* 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.