Changeset 42215

Timestamp:

11/21/2017 04:15:24 AM (7 years ago)

Author:

dd32

Message:

Upgrade: Fix updating plugins which include a numeric file/folder names.
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.
Merges [42214] to the 4.9 branch.
Fixes #42628 for 4.9.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)

branches/4.9/src/wp-admin/includes/class-wp-upgrader.php

@@ -343 +343 @@
                 $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;
             }
         }