Changes in trunk/wp-admin/includes/class-wp-filesystem-direct.php [15590:17926]

File:

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

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

@@ -20 +20 @@
      * constructor
      *
-     * @param mixed $arg ingored argument
-     */
-    function WP_Filesystem_Direct($arg) {
+     * @param mixed $arg ignored argument
+     */
+    function __construct($arg) {
         $this->method = 'direct';
         $this->errors = new WP_Error();
@@ -194 +194 @@
     }
 
-    function copy($source, $destination, $overwrite = false) {
+    function copy($source, $destination, $overwrite = false, $mode = false) {
         if ( ! $overwrite && $this->exists($destination) )
             return false;
 
-        return copy($source, $destination);
+        $rtval = copy($source, $destination);
+        if ( $mode )
+            $this->chmod($destination, $mode);
+        return $rtval;
     }
 
@@ -217 +220 @@
     }
 
-    function delete($file, $recursive = false) {
+    function delete($file, $recursive = false, $type = false) {
         if ( empty($file) ) //Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
             return false;
-        $file = str_replace('\\', '/', $file); //for win32, occasional problems deleteing files otherwise
-
-        if ( $this->is_file($file) )
+        $file = str_replace('\\', '/', $file); //for win32, occasional problems deleting files otherwise
+
+        if ( 'f' == $type || $this->is_file($file) )
             return @unlink($file);
         if ( ! $recursive && $this->is_dir($file) )
@@ -234 +237 @@
         if ( is_array($filelist) ) //false if no files, So check first.
             foreach ($filelist as $filename => $fileinfo)
-                if ( ! $this->delete($file . $filename, $recursive) )
+                if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
                     $retval = false;