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

Timestamp:

10/01/2015 05:08:07 AM (9 years ago)

Author:

dd32

Message:

Updates: Try a more compatible method to detect if a file exists when using the FTP Extension.
This change causes it to list the parent directories files, and assets that the node exists within the returned listing, this is a little more compatible than relying upon the FTP server to correctly filter the returned resultset to the specific file/node being requested.
Fixes #28013

File:

• trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (1 diff)

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

@@ -317 +317 @@
      * @return bool
      */
-    public function exists($file) {
-        $list = @ftp_rawlist( $this->link, '-a ' . $file );
-
-        if ( empty( $list ) && $this->is_dir( $file ) ) {
-            return true; // File is an empty directory.
-        }
-
-        return !empty($list); //empty list = no file, so invert.
+    public function exists( $file ) {
+        $path = dirname( $file );
+        $filename = basename( $file );
+
+        $file_list = @ftp_nlist( $this->link, '-a ' . $path );
+        if ( $file_list ) {
+            $file_list = array_map( 'basename', $file_list );
+        }
+
+        return $file_list && in_array( $filename, $file_list );
     }