WordPress 3.6.1

[autoinstalls/wordpress.git] / wp-admin / includes / update-core.php

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index daf7734990523ce47dcb2ab59e17603deda7ae98..ea1312b1329eec1b625b551bb08403230ecf3314 100644 (file)
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -535,9 +535,29 @@ $_old_files = array(
 'wp-includes/js/jquery/ui/jquery.effects.pulsate.min.js',
 'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js',
 'wp-includes/js/jquery/ui/jquery.effects.fold.min.js',
 'wp-includes/js/jquery/ui/jquery.effects.pulsate.min.js',
 'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js',
 'wp-includes/js/jquery/ui/jquery.effects.fold.min.js',

+'wp-admin/images/screenshots/captions-1.png',
+'wp-admin/images/screenshots/captions-2.png',
+'wp-admin/images/screenshots/flex-header-1.png',
+'wp-admin/images/screenshots/flex-header-2.png',
+'wp-admin/images/screenshots/flex-header-3.png',
+'wp-admin/images/screenshots/flex-header-media-library.png',
+'wp-admin/images/screenshots/theme-customizer.png',
+'wp-admin/images/screenshots/twitter-embed-1.png',
+'wp-admin/images/screenshots/twitter-embed-2.png',
+'wp-admin/js/utils.js',

 'wp-admin/options-privacy.php',
 'wp-admin/options-privacy.php',

+'wp-app.php',
+'wp-includes/class-wp-atom-server.php',
+'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css',

 // 3.5.2
 'wp-includes/js/swfupload/swfupload-all.js',
 // 3.5.2
 'wp-includes/js/swfupload/swfupload-all.js',

+// 3.6
+'wp-admin/js/revisions-js.php',
+'wp-admin/images/screenshots',
+'wp-admin/js/categories.js',
+'wp-admin/js/categories.min.js',
+'wp-admin/js/custom-fields.js',
+'wp-admin/js/custom-fields.min.js',

 );
 
 /**
 );
 
 /**


@@ -560,10 +580,11 @@ $_old_files = array(
 global $_new_bundled_files;
 
 $_new_bundled_files = array(
 global $_new_bundled_files;
 
 $_new_bundled_files = array(

-'plugins/akismet/' => '2.0',
-'themes/twentyten/' => '3.0',
-'themes/twentyeleven/' => '3.2',
-'themes/twentytwelve/' => '3.5',
+       'plugins/akismet/'       => '2.0',
+       'themes/twentyten/'      => '3.0',
+       'themes/twentyeleven/'   => '3.2',
+       'themes/twentytwelve/'   => '3.5',
+       'themes/twentythirteen/' => '3.6',

 );
 
 /**
 );
 
 /**


@@ -698,9 +719,7 @@ function update_core($from, $to) {
        // 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve.
        if ( '3.5' == $old_wp_version ) {
                if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' )  ) {
        // 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve.
        if ( '3.5' == $old_wp_version ) {
                if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' )  ) {

-                       // Bumping the introduced version to 3.5.1 for the affected users causes Twenty Twelve to be installed for the first time
-                       if ( $wp_filesystem->delete( $wp_filesystem->wp_themes_dir() . 'twentytwelve/' ) )
-                               $_new_bundled_files[ 'themes/twentytwelve/' ] = '3.5.1';
+                       $wp_filesystem->delete( $wp_filesystem->wp_themes_dir() . 'twentytwelve/' );

                }
        }
 
                }
        }