Changeset 23324

Timestamp:

01/22/2013 04:52:15 PM (12 years ago)

Author:

nacin

Message:

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].

Merges [23297] to the 3.5 branch.

props dd32
fixes #23177

File:

• branches/3.5/wp-admin/includes/update-core.php (modified) (1 diff, 1 prop)

branches/3.5/wp-admin/includes/update-core.php

@@ -632 +632 @@
 
     // 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 );