Skip to content
Permalink
Browse files

Filesystem API: Use strict type check in the `in_array()` call for th…

…e `$skip_list` parameter in `copy_dir()` and `_copy_dir()`.

This ensures that parent folders with a numeric name are not accidentally skipped when only a subfolder is intended to be skipped.

Props codex-m.
Fixes #46581.

git-svn-id: https://develop.svn.wordpress.org/trunk@46400 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information...
SergeyBiryukov committed Oct 5, 2019
1 parent ef942c6 commit e99e14570e37bdbb11a85f629ee578c0311a84d4
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/wp-admin/includes/file.php
  2. +1 −1 src/wp-admin/includes/update-core.php
@@ -1705,7 +1705,7 @@ function copy_dir( $from, $to, $skip_list = array() ) {
$to = trailingslashit( $to );
foreach ( (array) $dirlist as $filename => $fileinfo ) {
if ( in_array( $filename, $skip_list ) ) {
if ( in_array( $filename, $skip_list, true ) ) {
continue;
}
@@ -1312,7 +1312,7 @@ function _copy_dir( $from, $to, $skip_list = array() ) {
$to = trailingslashit( $to );
foreach ( (array) $dirlist as $filename => $fileinfo ) {
if ( in_array( $filename, $skip_list ) ) {
if ( in_array( $filename, $skip_list, true ) ) {
continue;
}

0 comments on commit e99e145

Please sign in to comment.
You can’t perform that action at this time.