Changes from branches/2.8/wp-admin/includes/class-wp-filesystem-direct.php at r11668 to trunk/wp-admin/includes/class-wp-filesystem-direct.php at r10919

File:

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

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

@@ -21 +21 @@
         $this->method = 'direct';
         $this->errors = new WP_Error();
+        $this->permission = umask();
     }
     function connect() {
@@ -64 +65 @@
     }
     function chmod($file, $mode = false, $recursive = false) {
+        if ( ! $mode )
+            $mode = $this->permission;
         if ( ! $this->exists($file) )
             return false;
-
-        if ( ! $mode ) {
-            if ( $this->permission )
-                $mode = $this->permission;
-            elseif ( $this->is_file($file) )
-                $mode = FS_CHMOD_FILE;
-            elseif ( $this->is_dir($file) )
-                $mode = FS_CHMOD_DIR;
-            else
-                return false;   
-        }
-
-        if ( ! $recursive )
-            return @chmod($file, $mode);
+        if ( ! $recursive )
+            return @chmod($file,$mode);
         if ( ! $this->is_dir($file) )
             return @chmod($file, $mode);
@@ -207 +198 @@
 
     function mkdir($path, $chmod = false, $chown = false, $chgrp = false){
-        if ( ! @mkdir($path) )
-            return false;
-        $this->chmod($path, $chmod);
+        if ( ! $chmod)
+            $chmod = $this->permission;
+
+        if ( ! @mkdir($path, $chmod) )
+            return false;
         if ( $chown )
             $this->chown($path, $chown);