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

dd32 · dd32 · commit 2c1858a8c3f6 · 2017-11-21T04:14:33.000Z
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
diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
@@ -342,7 +342,8 @@ protected function flatten_dirlist( $nested_files, $path = '' ) {
 			if ( ! empty( $details['files'] ) ) {
 				$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;
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,8 @@ protected function flatten_dirlist( $nested_files, $path = '' ) {`
`342`	`342`	`if ( ! empty( $details['files'] ) ) {`
`343`	`343`	`$children = $this->flatten_dirlist( $details['files'], $path . $name . '/' );`
`344`	`344`
`345`		`- $files = array_merge( $files, $children );`
	`345`	`+ // Merge keeping possible numeric keys, which array_merge() will reindex from 0..n`
	`346`	`+ $files = $files + $children;`
`346`	`347`	`}`
`347`	`348`	`}`
`348`	`349`