Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #91592 by ChrisKennedy: avoid scanning hidden files and directories.

5.x
Dries Buytaert 2006-12-11 16:45:17 +00:00
parent 161a856ab8
commit f6259ad36c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/file.inc
View File

@ -602,8 +602,10 @@ function file_download() {
/** /**
* Finds all files that match a given mask in a given * Finds all files that match a given mask in a given directory.
* directory. * Directories and files beginning with a period are excluded; this
* prevents hidden files and directories (such as SVN working directories)
* from being scanned.
* *
* @param $dir * @param $dir
* The base directory for the scan. * The base directory for the scan.
@ -637,7 +639,7 @@ function file_scan_directory($dir, $mask, $nomask = array('.', '..', 'CVS'), $ca
if (is_dir($dir) && $handle = opendir($dir)) { if (is_dir($dir) && $handle = opendir($dir)) {
while ($file = readdir($handle)) { while ($file = readdir($handle)) {
if (!in_array($file, $nomask)) { if (!in_array($file, $nomask) && $file[0] != '.') {
if (is_dir("$dir/$file") && $recurse) { if (is_dir("$dir/$file") && $recurse) {
$files = array_merge($files, file_scan_directory("$dir/$file", $mask, $nomask, $callback, $recurse, $key, $min_depth, $depth + 1)); $files = array_merge($files, file_scan_directory("$dir/$file", $mask, $nomask, $callback, $recurse, $key, $min_depth, $depth + 1));
} }