WordPress.org

Make WordPress Core

Changeset 23324


Ignore:
Timestamp:
01/22/13 16:52:15 (15 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.5/wp-admin/includes/update-core.php

    r23287 r23324  
    632632 
    633633    // Import $wp_version, $required_php_version, and $required_mysql_version from the new version 
    634     $versions_file = $wp_filesystem->wp_content_dir() . 'upgrade/version-current.php'; 
     634    // $wp_filesystem->wp_content_dir() returned unslashed pre-2.8 
     635    $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php'; 
    635636    if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) { 
    636637         $wp_filesystem->delete( $from, true ); 
Note: See TracChangeset for help on using the changeset viewer.