Changeset 12997

Timestamp:

02/07/2010 01:12:29 AM (17 years ago)

Author:

dd32

Message:

Fix recursive chmod for WP_Filesystem. Props reaperhulk for FtpExt. Fixes #11261

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-direct.php (modified) (1 diff)
• class-wp-filesystem-ftpext.php (modified) (1 diff)
• class-wp-filesystem-ftpsockets.php (modified) (1 diff)

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

@@ -136 +136 @@
                 $file = trailingslashit($file);
                 $filelist = $this->dirlist($file);
-                foreach ($filelist as $filename)
+                foreach ( (array)$filelist as $filename => $filemeta)
                         $this->chmod($file . $filename, $mode, $recursive);
 

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

@@ -155 +155 @@
                 }
 
-                if ( ! $recursive || ! $this->is_dir($file) ) {
-                        if ( ! function_exists('ftp_chmod') )
-                                return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
-                        return @ftp_chmod($this->link, $mode, $file);
-                }
-                //Is a directory, and we want recursive
-                $filelist = $this->dirlist($file);
-                foreach ( $filelist as $filename ) {
-                        $this->chmod($file . '/' . $filename, $mode, $recursive);
-                }
-                return true;
+                // chmod any sub-objects if recursive.
+                if ( $recursive && $this->is_dir($file) ) {
+                        $filelist = $this->dirlist($file);
+                        foreach ( (array)$filelist as $filename => $filemeta )
+                                $this->chmod($file . '/' . $filename, $mode, $recursive);
+                }
+
+                // chmod the file or directory
+                if ( ! function_exists('ftp_chmod') )
+                        return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+                return @ftp_chmod($this->link, $mode, $file);
         }
         function chown($file, $owner, $recursive = false ) {

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

@@ -165 +165 @@
                 }
 
-                if ( ! $recursive || ! $this->is_dir($file) ) {
-                        return $this->ftp->chmod($file, $mode);
-                }
-
-                //Is a directory, and we want recursive
-                $filelist = $this->dirlist($file);
-                foreach ( $filelist as $filename )
-                        $this->chmod($file . '/' . $filename, $mode, $recursive);
-
-                return true;
+                // chmod any sub-objects if recursive.
+                if ( $recursive && $this->is_dir($file) ) {
+                        $filelist = $this->dirlist($file);
+                        foreach ( (array)$filelist as $filename => $filemeta )
+                                $this->chmod($file . '/' . $filename, $mode, $recursive);
+                }
+
+                // chmod the file or directory
+                return $this->ftp->chmod($file, $mode);
         }