Ticket #10889: 10889.2.diff

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

@@ -54 +54 @@
         /**
          * Write a string to a file
          *
-         * @param $file string Path to the file where to write the data.
+         * @param $file string Remote path to the file where to write the data.
          * @param $contents string The data to write.
          * @param $mode int (optional) The file permissions as octal number, usually 0644.
-         * @param $type string (optional) Specifies additional type of access you require to the file.
+         * @param $type string (optional) Specifies additional type of access you require to the file. Only used by the FTP transports.
          * @return bool False upon failure.
          */
-        function put_contents($file, $contents, $mode = false, $type = '') {
+        function put_contents($file, $contents, $mode = false, $type = null) {
                 if ( ! ($fp = @fopen($file, 'w' . $type)) )
                         return false;
                 @fwrite($fp, $contents);

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

@@ -111 +111 @@
         function get_contents_array($file) {
                 return explode("\n", $this->get_contents($file));
         }
-        function put_contents($file, $contents, $type = '' ) {
+        
+        function put_contents($file, $contents, $mode = false, $type = null ) {
                 if ( empty($type) )
                         $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
 
@@ -125 +126 @@
                 $ret = @ftp_fput($this->link, $file, $temp, $type);
 
                 fclose($temp);
+
+                $this->chmod($file, $mode);
+
                 return $ret;
         }
         function cwd() {

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

@@ -115 +115 @@
                 return explode("\n", $this->get_contents($file) );
         }
 
-        function put_contents($file, $contents, $type = '' ) {
+        function put_contents($file, $contents, $mode = false, $type = null ) {
                 if ( empty($type) )
                         $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
 
                 $this->ftp->SetType($type);
 
                 $temp = wp_tempnam( $file );
-                if ( ! $temphandle = fopen($temp, 'w+') ) {
+                if ( ! $temphandle = @fopen($temp, 'w+') ) {
                         unlink($temp);
                         return false;
                 }
@@ -134 +134 @@
 
                 fclose($temphandle);
                 unlink($temp);
+
+                $this->chmod($file, $mode);
+
                 return $ret;
         }
 

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

@@ -160 +160 @@
                 return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
         }
 
-        function put_contents($file, $contents, $type = '' ) {
+        function put_contents($file, $contents, $mode = false, $type = null ) {
                 $file = ltrim($file, '/');
-                return false !== file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+                $ret = file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+                
+                $this->chmod($file, $mode);
+                
+                return false !== $ret;
         }
 
         function cwd() {

wp-admin/includes/file.php

@@ -546 +546 @@
 
                 // We've made sure the folders are there, so let's extract the file now:
                 if ( ! $file['folder'] ) {
-                        if ( !$fs->put_contents( $to . $file['filename'], $file['content']) )
+                        if ( !$fs->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
                                 return new WP_Error('copy_failed', __('Could not copy file'), $to . $file['filename']);
-                        $fs->chmod($to . $file['filename'], FS_CHMOD_FILE);
                 }
         }
         return true;