WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

see #22704.

Built from https://develop.svn.wordpress.org/trunk@25797


git-svn-id: http://core.svn.wordpress.org/trunk@25709 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-15 20:01:09 +00:00
parent 82547b21b6
commit a6188bc84a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/update-core.php
View File

@ -722,8 +722,10 @@ function update_core($from, $to) {
} }
// Store package-relative paths (the key) of non-writable files in the WP_Error object. // 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 ) 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 );
} }
} }