vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-06 15:47:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include 'hidden' directories in filesystem dirlist by default, props dd32, fixes #10774

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@11934 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2009-09-15 02:21:00 +00:00
parent fa9b9d3ad3
commit 707676f0ac
4 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/includes/class-wp-filesystem-direct.php
+13 -8
View File
@@ -307,29 +307,34 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
return @rmdir($path);
}
function dirlist($path, $incdot = false, $recursive = false) {
function dirlist($path, $include_hidden = true, $recursive = false) {
if ( $this->is_file($path) ) {
$limitFile = basename($path);
$limit_file = basename($path);
$path = dirname($path);
} else {
$limitFile = false;
$limit_file = false;
}
if ( ! $this->is_dir($path) )
return false;
$ret = array();
$dir = @dir($path);
if ( ! $dir )
return false;
$ret = array();
while (false !== ($entry = $dir->read()) ) {
$struc = array();
$struc['name'] = $entry;
if ( '.' == $struc['name'] || '..' == $struc['name'] )
continue; //Do not care about these folders.
if ( '.' == $struc['name'][0] && !$incdot)
continue;
if ( $limitFile && $struc['name'] != $limitFile)
if ( ! $include_hidden && '.' == $struc['name'][0] )
continue;
if ( $limit_file && $struc['name'] != $limit_file)
continue;
$struc['perms'] = $this->gethchmod($path.'/'.$entry);
@@ -345,7 +350,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
if ( 'd' == $struc['type'] ) {
if ( $recursive )
$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
else
$struc['files'] = array();
}