sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade: Fix updating plugins which include a numeric file/folder names.

Browse Source 
The fix in [41821] caused numeric folder names to be reindexed to 0..n when in the root directory (for example, `my-plugin/24/`).

Props edo888.
See #41524.
Fixes #42628 for trunk.


git-svn-id: https://develop.svn.wordpress.org/trunk@42214 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2017-11-21 04:14:33 +00:00
parent 4ec5d65dcc
commit 2c1858a8c3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-admin/includes/class-wp-upgrader.php
View File

@ -342,7 +342,8 @@ class WP_Upgrader {
if ( ! empty( $details['files'] ) ) { if ( ! empty( $details['files'] ) ) {
$children = $this->flatten_dirlist( $details['files'], $path . $name . '/' ); $children = $this->flatten_dirlist( $details['files'], $path . $name . '/' );
$files = array_merge( $files, $children ); // Merge keeping possible numeric keys, which array_merge() will reindex from 0..n
$files = $files + $children;
} }
} }