Ticket #10889: 10889.diff

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

@@ -135 +135 @@
                 fwrite($temphandle, $contents);
                 fseek($temphandle, 0); //Skip back to the start of the file being written to
 
+                $dir = dirname($file);
+                $file = basename($file);
+                if ( $dir && $dir != '.' ) {
+                        $dir = $this->find_folder($dir);
+                        $this->chdir($dir);
+                }
                 $ret = $this->ftp->fput($file, $temphandle);
 
                 fclose($temphandle);

wp-admin/includes/class-wp-upgrader.php

@@ -323 +323 @@
                         // Create maintenance file to signal that we are upgrading
                         $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
                         $wp_filesystem->delete($file);
-                        $wp_filesystem->put_contents($file, $maintenance_string, FS_CHMOD_FILE);
+                        $wp_filesystem->put_contents($file, $maintenance_string);
                 } else if ( !$enable && $wp_filesystem->exists($file) ) {
                         $this->skin->feedback('maintenance_end');
                         $wp_filesystem->delete($file);

wp-admin/includes/update-core.php

@@ -223 +223 @@
         $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
         $maintenance_file = $to . '.maintenance';
         $wp_filesystem->delete($maintenance_file);
-        $wp_filesystem->put_contents($maintenance_file, $maintenance_string, FS_CHMOD_FILE);
+        $wp_filesystem->put_contents($maintenance_file, $maintenance_string);
 
         // Copy new versions of WP files into place.
         $result = copy_dir($from . '/wordpress', $to);

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

@@ -122 +122 @@
                 fwrite($temp, $contents);
                 fseek($temp, 0); //Skip back to the start of the file being written to
 
+                $dir = dirname($file);
+                $file = basename($file);
+                if ( $dir && $dir != '.' ) {
+                        $dir = $this->find_folder($dir);
+                        $this->chdir($dir);
+                }
                 $ret = @ftp_fput($this->link, $file, $temp, $type);
 
                 fclose($temp);
@@ -134 +140 @@
                 return $cwd;
         }
         function chdir($dir) {
-                return @ftp_chdir($dir);
+                return @ftp_chdir($this->link, $dir);
         }
         function chgrp($file, $group, $recursive = false ) {
                 return false;