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

Timestamp:

03/22/2011 12:04:15 AM (16 years ago)

Author:

dd32

Message:

Optimisations to WP_Filesystem; Pass known information to called functions. Props aldenta (John Ford) for investigation and patch. See #10913

File:

• trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (4 diffs)

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

@@ -184 +184 @@
                 return $dir[$file]['group'];
         }
-        function copy($source, $destination, $overwrite = false ) {
+        function copy($source, $destination, $overwrite = false, $mode = false) {
                 if ( ! $overwrite && $this->exists($destination) )
                         return false;
@@ -190 +190 @@
                 if ( false === $content)
                         return false;
-                return $this->put_contents($destination, $content);
+                return $this->put_contents($destination, $content, $mode);
         }
         function move($source, $destination, $overwrite = false) {
@@ -196 +196 @@
         }
 
-        function delete($file, $recursive = false ) {
+        function delete($file, $recursive = false, $type = false) {
                 if ( empty($file) )
                         return false;
-                if ( $this->is_file($file) )
+                if ( 'f' == $type || $this->is_file($file) )
                         return @ftp_delete($this->link, $file);
                 if ( !$recursive )
@@ -207 +207 @@
                 if ( !empty($filelist) )
                         foreach ( $filelist as $delete_file )
-                                $this->delete( trailingslashit($file) . $delete_file['name'], $recursive);
+                                $this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
                 return @ftp_rmdir($this->link, $file);
         }