Changeset 11934 for trunk/wp-admin/includes/class-wp-filesystem-direct.php

Timestamp:

09/15/2009 02:21:00 AM (17 years ago)

Author:

azaozz

Message:

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

File:

• trunk/wp-admin/includes/class-wp-filesystem-direct.php (modified) (3 diffs)

trunk/wp-admin/includes/class-wp-filesystem-direct.php

@@ -308 +308 @@
     }
 
-    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();
@@ -327 +330 @@
 
             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;
 
@@ -346 +351 @@
             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();