Changeset 31815

Timestamp:

03/18/2015 07:21:33 PM (10 years ago)

Author:

ocean90

Message:

WP_Filesystem: Change WP_Filesystem_FTPext::exists() and WP_Filesystem_ftpsockets::exists() to return true for empty directories.

Both methods are using *nlist() which returns a list of files in a given directory or the file itself for a given file. If the result was an empty list we assumed that the file doesn't exists. This includes also cases where $file is actually an empty directory. To prevent this we now check if $file is a directory before returning the result of an empty list.
Other filesystem methods are using file_exists() which already checks whether a file or directory exists.

fixes #30815.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-filesystem-ftpext.php (modified) (1 diff)
• class-wp-filesystem-ftpsockets.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -276 +276 @@
     public function exists($file) {
         $list = @ftp_nlist($this->link, $file);
+
+        if ( empty( $list ) && $this->is_dir( $file ) ) {
+            return true; // File is an empty directory.
+        }
+
         return !empty($list); //empty list = no file, so invert.
     }

trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -275 +275 @@
     public function exists( $file ) {
         $list = $this->ftp->nlist( $file );
+
+        if ( empty( $list ) && $this->is_dir( $file ) ) {
+            return true; // File is an empty directory.
+        }
+
         return !empty( $list ); //empty list = no file, so invert.
         // Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.