From 9507d222432fd2181f5431198422640e5e9b1d0b Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Tue, 15 Oct 2013 22:07:09 +0000 Subject: [PATCH] Use correct variable. see #22704. Built from https://develop.svn.wordpress.org/trunk@25800 git-svn-id: http://core.svn.wordpress.org/trunk@25712 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/update-core.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 32266bb70f..a74abd20bb 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -725,7 +725,7 @@ function update_core($from, $to) { $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.' ), $data ); + return new WP_Error( 'files_not_writable', __( 'Could not copy file.' ), $error_data ); } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 583c21cf53..9c0d392f72 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '3.7-beta2-25795'; +$wp_version = '3.7-beta2-25800'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.