From a6188bc84af4a0c7f221876fbef609b4dd99cde2 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Tue, 15 Oct 2013 20:01:09 +0000 Subject: [PATCH] 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 --- wp-admin/includes/update-core.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index a4b5cd76f2..b3062e9685 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -722,8 +722,10 @@ function update_core($from, $to) { } // 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 ); } }