Changeset 25797 for trunk/src/wp-admin/includes/update-core.php

Timestamp:

10/15/2013 08:00:01 PM (12 years ago)

Author:

nacin

Message:

Only add error data to the files_not_writable WP_Error if the install already has [25775] and [25796] applied.

see #22704.

File:

• trunk/src/wp-admin/includes/update-core.php (modified) (1 diff)

trunk/src/wp-admin/includes/update-core.php

@@ -723 +723 @@
 
             // Store package-relative paths (the key) of non-writable files in the WP_Error object.
+            $error_data = version_compare( $old_wp_version, '3.7-beta2', '>' ) ? array_keys( $files_not_writable ) : '';
+
             if ( $files_not_writable )
-                return new WP_Error( 'files_not_writable', __( 'Could not copy file.' ), array_keys( $files_not_writable ) );
+                return new WP_Error( 'files_not_writable', __( 'Could not copy file.' ), $data );
         }
     }