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

Timestamp:

03/22/2011 12:04:15 AM (13 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-ssh2.php (modified) (4 diffs)

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

@@ -239 +239 @@
     }
 
-    function copy($source, $destination, $overwrite = false ) {
+    function copy($source, $destination, $overwrite = false, $mode = false) {
         if ( ! $overwrite && $this->exists($destination) )
             return false;
@@ -245 +245 @@
         if ( false === $content)
             return false;
-        return $this->put_contents($destination, $content);
+        return $this->put_contents($destination, $content, $mode);
     }
 
@@ -252 +252 @@
     }
 
-    function delete($file, $recursive = false) {
-        if ( $this->is_file($file) )
+    function delete($file, $recursive = false, $type = false) {
+        if ( 'f' == $type || $this->is_file($file) )
             return ssh2_sftp_unlink($this->sftp_link, $file);
         if ( ! $recursive )
@@ -260 +260 @@
         if ( is_array($filelist) ) {
             foreach ( $filelist as $filename => $fileinfo) {
-                $this->delete($file . '/' . $filename, $recursive);
+                $this->delete($file . '/' . $filename, $recursive, $fileinfo['type']);
             }
         }