Changeset 12723 for trunk/wp-admin/includes/class-wp-filesystem-ftpext.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-ftpext.php (modified) (2 diffs)

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

@@ -112 +112 @@
         return explode("\n", $this->get_contents($file));
     }
-    function put_contents($file, $contents, $type = '' ) {
-        if ( empty($type) )
-            $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
-
+    
+    function put_contents($file, $contents, $mode = false ) {
         $temp = tmpfile();
         if ( ! $temp )
@@ -123 +121 @@
         fseek($temp, 0); //Skip back to the start of the file being written to
 
+        $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
         $ret = @ftp_fput($this->link, $file, $temp, $type);
 
         fclose($temp);
+
+        $this->chmod($file, $mode);
+
         return $ret;
     }