Changeset 12998 for trunk/wp-admin/includes/class-wp-filesystem-direct.php

Timestamp:

02/07/2010 01:31:40 AM (14 years ago)

Author:

dd32

Message:

Reduce code duplication, Formatting cleanups, Reduce Chmod IO calls. See #10913 for excess IO calls.

File:

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

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

@@ -117 +117 @@
      */
     function chmod($file, $mode = false, $recursive = false) {
-        if ( ! $this->exists($file) )
-            return false;
-
         if ( ! $mode ) {
             if ( $this->is_file($file) )
@@ -129 +126 @@
         }
 
-        if ( ! $recursive )
-            return @chmod($file, $mode);
-        if ( ! $this->is_dir($file) )
+        if ( ! $recursive || ! $this->is_dir($file) )
             return @chmod($file, $mode);
         //Is a directory, and we want recursive
@@ -299 +294 @@
 
     function rmdir($path, $recursive = false) {
-        //Currently unused and untested, Use delete() instead.
-        if ( ! $recursive )
-            return @rmdir($path);
-        //recursive:
-        $filelist = $this->dirlist($path);
-        foreach ($filelist as $filename => $det) {
-            if ( '/' == substr($filename, -1, 1) )
-                $this->rmdir($path . '/' . $filename, $recursive);
-            @rmdir($filename);
-        }
-        return @rmdir($path);
+        return $this->delete($path, $recursive);
     }