Changeset 35945

Timestamp:

12/15/2015 02:36:59 AM (9 years ago)

Author:

dd32

Message:

Filesystem: Revert [33648] and [34733] unfortunately these have caused issues for some servers, while fixing it for others.

See #28013
Fixes #34976 for the 4.4 branch
Fixes #34976 for the 4.4 branch

Location:

branches/4.4

Files:

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

branches/4.4/src/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -327 +327 @@
      * @return bool
      */
-    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 );
+    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.
     }
 

branches/4.4/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -343 +343 @@
      */
     public function exists( $file ) {
-        $list = $this->ftp->rawlist( $file, '-a' );
+        $list = $this->ftp->nlist( $file );
 
         if ( empty( $list ) && $this->is_dir( $file ) ) {