WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

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

    r22227 r23324  
    536536'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js',
    537537'wp-includes/js/jquery/ui/jquery.effects.fold.min.js',
     538'wp-admin/options-privacy.php',
    538539);
    539540
     
    631632
    632633    // Import $wp_version, $required_php_version, and $required_mysql_version from the new version
    633     $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';
    634636    if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
    635637         $wp_filesystem->delete( $from, true );
     
    692694    }
    693695
     696    // 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve.
     697    if ( '3.5' == $old_wp_version ) {
     698        if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' )  ) {
     699            // Bumping the introduced version to 3.5.1 for the affected users causes Twenty Twelve to be installed for the first time
     700            if ( $wp_filesystem->delete( $wp_filesystem->wp_themes_dir() . 'twentytwelve/' ) )
     701                $_new_bundled_files[ 'themes/twentytwelve/' ] = '3.5.1';
     702        }
     703    }
     704
    694705    // Copy New bundled plugins & themes
    695706    // This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.
     
    701712                $directory = ('/' == $file[ strlen($file)-1 ]);
    702713                list($type, $filename) = explode('/', $file, 2);
     714
     715                // Check to see if the bundled items exist before attempting to copy them
     716                if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) )
     717                    continue;
    703718
    704719                if ( 'plugins' == $type )
Note: See TracChangeset for help on using the changeset viewer.