diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 68dca1a07..f9ac5fb43 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -542,8 +542,12 @@ function copy_dir($from, $to) { foreach ( (array) $dirlist as $filename => $fileinfo ) { if ( 'f' == $fileinfo['type'] ) { - if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) - return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename); + if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) { + // If copy failed, chmod file to 0644 and try again. + $wp_filesystem->chmod($to . $filename, 0644); + if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true) ) + return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename); + } $wp_filesystem->chmod($to . $filename, 0644); } elseif ( 'd' == $fileinfo['type'] ) { if ( !$wp_filesystem->is_dir($to . $filename) ) { diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 097bea569..470dd08b5 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -1290,6 +1290,10 @@ table.form-table td .updated { /* Post Screen */ +#normal-sortables { + min-height: 50px; +} + .postbox { position: relative; min-width: 255px;