Changeset 12723 for trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php

Timestamp:

01/14/2010 09:23:53 AM (16 years ago)

Author:

dd32

Message:

Standardise WP_Filesystem_*::put_contents() arguments to support chmod reliably across all transports. Fixes #10889

File:

• trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (modified) (2 diffs)

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

@@ -116 +116 @@
     }
 
-    function put_contents($file, $contents, $type = '' ) {
-        if ( empty($type) )
-            $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
-
-        $this->ftp->SetType($type);
-
+    function put_contents($file, $contents, $mode = false ) {
         $temp = wp_tempnam( $file );
-        if ( ! $temphandle = fopen($temp, 'w+') ) {
+        if ( ! $temphandle = @fopen($temp, 'w+') ) {
             unlink($temp);
             return false;
@@ -131 +126 @@
         fseek($temphandle, 0); //Skip back to the start of the file being written to
 
+        $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
+        $this->ftp->SetType($type);
+
         $ret = $this->ftp->fput($file, $temphandle);
 
         fclose($temphandle);
         unlink($temp);
+
+        $this->chmod($file, $mode);
+
         return $ret;
     }