From f4beefbb888c9a8c06f44239af8dab6c061d78b2 Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Fri, 11 Jan 2013 10:16:45 +0000 Subject: [PATCH] Core Update: Fix a issue which caused automatic upgrades from 2.7 to 3.5+ to fail. Pre-2.7 WP_Filesystem::wp_content_dir() returned unslashed paths. Introduced in [22227]. See #23177 git-svn-id: https://develop.svn.wordpress.org/trunk@23297 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/update-core.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 8211e454c0..c83f9698b8 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -644,7 +644,8 @@ function update_core($from, $to) { } // Import $wp_version, $required_php_version, and $required_mysql_version from the new version - $versions_file = $wp_filesystem->wp_content_dir() . 'upgrade/version-current.php'; + // $wp_filesystem->wp_content_dir() returned unslashed pre-2.8 + $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php'; if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) { $wp_filesystem->delete( $from, true ); return new WP_Error( 'copy_failed', __('Could not copy file.') );