Changeset 9493

Timestamp:

11/03/2008 05:16:41 PM (17 years ago)

Author:

ryan

Message:

IF copy fails, chmod target to 0644 and try again

Location:

trunk/wp-admin

Files:

• includes/file.php (modified) (1 diff)
• wp-admin.css (modified) (1 diff)

trunk/wp-admin/includes/file.php

@@ -543 +543 @@
     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'] ) {

trunk/wp-admin/wp-admin.css

@@ -1291 +1291 @@
 /* Post Screen */
 
+#normal-sortables {
+    min-height: 50px;
+}
+
 .postbox {
     position: relative;