WordPress 4.2.2
[autoinstalls/wordpress.git] / wp-admin / includes / update-core.php
index 85eb84062ad91bec4118c5f4fd952f6fc8811b88..a15cc887e12158e8646e9bf7b215d201f1c10021 100644 (file)
@@ -292,20 +292,14 @@ $_old_files = array(
 'wp-admin/css/colors-classic-rtl.dev.css',
 'wp-admin/css/colors-fresh-rtl.css',
 'wp-admin/css/colors-fresh-rtl.dev.css',
 'wp-admin/css/colors-classic-rtl.dev.css',
 'wp-admin/css/colors-fresh-rtl.css',
 'wp-admin/css/colors-fresh-rtl.dev.css',
-'wp-admin/css/dashboard-rtl.css',
 'wp-admin/css/dashboard-rtl.dev.css',
 'wp-admin/css/dashboard-rtl.dev.css',
-'wp-admin/css/dashboard.css',
 'wp-admin/css/dashboard.dev.css',
 'wp-admin/css/dashboard.dev.css',
-'wp-admin/css/farbtastic-rtl.css',
 'wp-admin/css/global-rtl.css',
 'wp-admin/css/global-rtl.dev.css',
 'wp-admin/css/global.css',
 'wp-admin/css/global.dev.css',
 'wp-admin/css/global-rtl.css',
 'wp-admin/css/global-rtl.dev.css',
 'wp-admin/css/global.css',
 'wp-admin/css/global.dev.css',
-'wp-admin/css/install-rtl.css',
 'wp-admin/css/install-rtl.dev.css',
 'wp-admin/css/install-rtl.dev.css',
-'wp-admin/css/login-rtl.css',
 'wp-admin/css/login-rtl.dev.css',
 'wp-admin/css/login-rtl.dev.css',
-'wp-admin/css/login.css',
 'wp-admin/css/login.dev.css',
 'wp-admin/css/ms.css',
 'wp-admin/css/ms.dev.css',
 'wp-admin/css/login.dev.css',
 'wp-admin/css/ms.css',
 'wp-admin/css/ms.dev.css',
@@ -317,9 +311,7 @@ $_old_files = array(
 'wp-admin/css/plugin-install-rtl.dev.css',
 'wp-admin/css/plugin-install.css',
 'wp-admin/css/plugin-install.dev.css',
 'wp-admin/css/plugin-install-rtl.dev.css',
 'wp-admin/css/plugin-install.css',
 'wp-admin/css/plugin-install.dev.css',
-'wp-admin/css/press-this-rtl.css',
 'wp-admin/css/press-this-rtl.dev.css',
 'wp-admin/css/press-this-rtl.dev.css',
-'wp-admin/css/press-this.css',
 'wp-admin/css/press-this.dev.css',
 'wp-admin/css/theme-editor-rtl.css',
 'wp-admin/css/theme-editor-rtl.dev.css',
 'wp-admin/css/press-this.dev.css',
 'wp-admin/css/theme-editor-rtl.css',
 'wp-admin/css/theme-editor-rtl.dev.css',
@@ -329,9 +321,7 @@ $_old_files = array(
 'wp-admin/css/theme-install-rtl.dev.css',
 'wp-admin/css/theme-install.css',
 'wp-admin/css/theme-install.dev.css',
 'wp-admin/css/theme-install-rtl.dev.css',
 'wp-admin/css/theme-install.css',
 'wp-admin/css/theme-install.dev.css',
-'wp-admin/css/widgets-rtl.css',
 'wp-admin/css/widgets-rtl.dev.css',
 'wp-admin/css/widgets-rtl.dev.css',
-'wp-admin/css/widgets.css',
 'wp-admin/css/widgets.dev.css',
 'wp-admin/includes/internal-linking.php',
 'wp-includes/images/admin-bar-sprite-rtl.png',
 'wp-admin/css/widgets.dev.css',
 'wp-admin/includes/internal-linking.php',
 'wp-includes/images/admin-bar-sprite-rtl.png',
@@ -554,6 +544,157 @@ $_old_files = array(
 // 3.6
 'wp-admin/js/revisions-js.php',
 'wp-admin/images/screenshots',
 // 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',
+// 3.7
+'wp-admin/js/cat.js',
+'wp-admin/js/cat.min.js',
+'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.min.js',
+// 3.8
+'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/page_bug.gif',
+'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/more_bug.gif',
+'wp-includes/js/thickbox/tb-close-2x.png',
+'wp-includes/js/thickbox/tb-close.png',
+'wp-includes/images/wpmini-blue-2x.png',
+'wp-includes/images/wpmini-blue.png',
+'wp-admin/css/colors-fresh.css',
+'wp-admin/css/colors-classic.css',
+'wp-admin/css/colors-fresh.min.css',
+'wp-admin/css/colors-classic.min.css',
+'wp-admin/js/about.min.js',
+'wp-admin/js/about.js',
+'wp-admin/images/arrows-dark-vs-2x.png',
+'wp-admin/images/wp-logo-vs.png',
+'wp-admin/images/arrows-dark-vs.png',
+'wp-admin/images/wp-logo.png',
+'wp-admin/images/arrows-pr.png',
+'wp-admin/images/arrows-dark.png',
+'wp-admin/images/press-this.png',
+'wp-admin/images/press-this-2x.png',
+'wp-admin/images/arrows-vs-2x.png',
+'wp-admin/images/welcome-icons.png',
+'wp-admin/images/wp-logo-2x.png',
+'wp-admin/images/stars-rtl-2x.png',
+'wp-admin/images/arrows-dark-2x.png',
+'wp-admin/images/arrows-pr-2x.png',
+'wp-admin/images/menu-shadow-rtl.png',
+'wp-admin/images/arrows-vs.png',
+'wp-admin/images/about-search-2x.png',
+'wp-admin/images/bubble_bg-rtl-2x.gif',
+'wp-admin/images/wp-badge-2x.png',
+'wp-admin/images/wordpress-logo-2x.png',
+'wp-admin/images/bubble_bg-rtl.gif',
+'wp-admin/images/wp-badge.png',
+'wp-admin/images/menu-shadow.png',
+'wp-admin/images/about-globe-2x.png',
+'wp-admin/images/welcome-icons-2x.png',
+'wp-admin/images/stars-rtl.png',
+'wp-admin/images/wp-logo-vs-2x.png',
+'wp-admin/images/about-updates-2x.png',
+// 3.9
+'wp-admin/css/colors.css',
+'wp-admin/css/colors.min.css',
+'wp-admin/css/colors-rtl.css',
+'wp-admin/css/colors-rtl.min.css',
+'wp-admin/css/media-rtl.min.css',
+'wp-admin/css/media.min.css',
+'wp-admin/css/farbtastic-rtl.min.css',
+'wp-admin/images/lock-2x.png',
+'wp-admin/images/lock.png',
+'wp-admin/js/theme-preview.js',
+'wp-admin/js/theme-install.min.js',
+'wp-admin/js/theme-install.js',
+'wp-admin/js/theme-preview.min.js',
+'wp-includes/js/plupload/plupload.html4.js',
+'wp-includes/js/plupload/plupload.html5.js',
+'wp-includes/js/plupload/changelog.txt',
+'wp-includes/js/plupload/plupload.silverlight.js',
+'wp-includes/js/plupload/plupload.flash.js',
+'wp-includes/js/plupload/plupload.js',
+'wp-includes/js/tinymce/plugins/spellchecker',
+'wp-includes/js/tinymce/plugins/inlinepopups',
+'wp-includes/js/tinymce/plugins/media/js',
+'wp-includes/js/tinymce/plugins/media/css',
+'wp-includes/js/tinymce/plugins/wordpress/img',
+'wp-includes/js/tinymce/plugins/wpdialogs/js',
+'wp-includes/js/tinymce/plugins/wpeditimage/img',
+'wp-includes/js/tinymce/plugins/wpeditimage/js',
+'wp-includes/js/tinymce/plugins/wpeditimage/css',
+'wp-includes/js/tinymce/plugins/wpgallery/img',
+'wp-includes/js/tinymce/plugins/wpfullscreen/css',
+'wp-includes/js/tinymce/plugins/paste/js',
+'wp-includes/js/tinymce/themes/advanced',
+'wp-includes/js/tinymce/tiny_mce.js',
+'wp-includes/js/tinymce/mark_loaded_src.js',
+'wp-includes/js/tinymce/wp-tinymce-schema.js',
+'wp-includes/js/tinymce/plugins/media/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/media/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/media/media.htm',
+'wp-includes/js/tinymce/plugins/wpview/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/wpview/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/directionality/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/wpeditimage/editimage.html',
+'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/fullscreen/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm',
+'wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/wplink/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/paste/editor_plugin.js',
+'wp-includes/js/tinymce/plugins/paste/pasteword.htm',
+'wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js',
+'wp-includes/js/tinymce/plugins/paste/pastetext.htm',
+'wp-includes/js/tinymce/langs/wp-langs.php',
+// 4.1
+'wp-includes/js/jquery/ui/jquery.ui.accordion.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.autocomplete.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.button.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.core.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.datepicker.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.dialog.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.draggable.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.droppable.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-blind.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-bounce.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-clip.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-drop.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-explode.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-fade.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-fold.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-highlight.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-pulsate.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-scale.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-shake.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-slide.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect-transfer.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.effect.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.menu.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.mouse.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.position.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.progressbar.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.resizable.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.selectable.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.slider.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.sortable.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.spinner.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.tabs.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js',
+'wp-includes/js/jquery/ui/jquery.ui.widget.min.js',
+'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png'
 );
 
 /**
 );
 
 /**
@@ -581,6 +722,8 @@ $_new_bundled_files = array(
        'themes/twentyeleven/'   => '3.2',
        'themes/twentytwelve/'   => '3.5',
        'themes/twentythirteen/' => '3.6',
        'themes/twentyeleven/'   => '3.2',
        'themes/twentytwelve/'   => '3.5',
        'themes/twentythirteen/' => '3.6',
+       'themes/twentyfourteen/' => '3.8',
+       'themes/twentyfifteen/'  => '4.1',
 );
 
 /**
 );
 
 /**
@@ -634,8 +777,26 @@ function update_core($from, $to) {
 
        @set_time_limit( 300 );
 
 
        @set_time_limit( 300 );
 
-       // Sanity check the unzipped distribution
-       apply_filters( 'update_feedback', __('Verifying the unpacked files…') );
+       /**
+        * Filter feedback messages displayed during the core update process.
+        *
+        * The filter is first evaluated after the zip file for the latest version
+        * has been downloaded and unzipped. It is evaluated five more times during
+        * the process:
+        *
+        * 1. Before WordPress begins the core upgrade process.
+        * 2. Before Maintenance Mode is enabled.
+        * 3. Before WordPress begins copying over the necessary files.
+        * 4. Before Maintenance Mode is disabled.
+        * 5. Before the database is upgraded.
+        *
+        * @since 2.5.0
+        *
+        * @param string $feedback The core update feedback messages.
+        */
+       apply_filters( 'update_feedback', __( 'Verifying the unpacked files…' ) );
+
+       // Sanity check the unzipped distribution.
        $distro = '';
        $roots = array( '/wordpress/', '/wordpress-mu/' );
        foreach ( $roots as $root ) {
        $distro = '';
        $roots = array( '/wordpress/', '/wordpress-mu/' );
        foreach ( $roots as $root ) {
@@ -651,19 +812,21 @@ function update_core($from, $to) {
 
        // Import $wp_version, $required_php_version, and $required_mysql_version from the new version
        // $wp_filesystem->wp_content_dir() returned unslashed pre-2.8
 
        // Import $wp_version, $required_php_version, and $required_mysql_version from the new version
        // $wp_filesystem->wp_content_dir() returned unslashed pre-2.8
+       global $wp_version, $required_php_version, $required_mysql_version;
+
        $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';
        if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
        $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.') );
+               $wp_filesystem->delete( $from, true );
+               return new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' );
        }
 
        $wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE );
        }
 
        $wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE );
-       require_once( WP_CONTENT_DIR . '/upgrade/version-current.php' );
+       require( WP_CONTENT_DIR . '/upgrade/version-current.php' );
        $wp_filesystem->delete( $versions_file );
 
        $php_version    = phpversion();
        $mysql_version  = $wpdb->db_version();
        $wp_filesystem->delete( $versions_file );
 
        $php_version    = phpversion();
        $mysql_version  = $wpdb->db_version();
-       $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from
+       $old_wp_version = $wp_version; // The version of WordPress we're updating from
        $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' )  ); // a dash in the version indicates a Development release
        $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
        if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
        $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' )  ); // a dash in the version indicates a Development release
        $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
        if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
@@ -681,16 +844,117 @@ function update_core($from, $to) {
        elseif ( !$mysql_compat )
                return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
 
        elseif ( !$mysql_compat )
                return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
 
-       apply_filters('update_feedback', __('Installing the latest version…'));
+       /** This filter is documented in wp-admin/includes/update-core.php */
+       apply_filters( 'update_feedback', __( 'Preparing to install the latest version…' ) );
+
+       // Don't copy wp-content, we'll deal with that below
+       // We also copy version.php last so failed updates report their old version
+       $skip = array( 'wp-content', 'wp-includes/version.php' );
+       $check_is_writable = array();
+
+       // Check to see which files don't really need updating - only available for 3.7 and higher
+       if ( function_exists( 'get_core_checksums' ) ) {
+               // Find the local version of the working directory
+               $working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro;
+
+               $checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
+               if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) )
+                       $checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2
+               if ( is_array( $checksums ) ) {
+                       foreach( $checksums as $file => $checksum ) {
+                               if ( 'wp-content' == substr( $file, 0, 10 ) )
+                                       continue;
+                               if ( ! file_exists( ABSPATH . $file ) )
+                                       continue;
+                               if ( ! file_exists( $working_dir_local . $file ) )
+                                       continue;
+                               if ( md5_file( ABSPATH . $file ) === $checksum )
+                                       $skip[] = $file;
+                               else
+                                       $check_is_writable[ $file ] = ABSPATH . $file;
+                       }
+               }
+       }
+
+       // If we're using the direct method, we can predict write failures that are due to permissions.
+       if ( $check_is_writable && 'direct' === $wp_filesystem->method ) {
+               $files_writable = array_filter( $check_is_writable, array( $wp_filesystem, 'is_writable' ) );
+               if ( $files_writable !== $check_is_writable ) {
+                       $files_not_writable = array_diff_key( $check_is_writable, $files_writable );
+                       foreach ( $files_not_writable as $relative_file_not_writable => $file_not_writable ) {
+                               // If the writable check failed, chmod file to 0644 and try again, same as copy_dir().
+                               $wp_filesystem->chmod( $file_not_writable, FS_CHMOD_FILE );
+                               if ( $wp_filesystem->is_writable( $file_not_writable ) )
+                                       unset( $files_not_writable[ $relative_file_not_writable ] );
+                       }
+
+                       // Store package-relative paths (the key) of non-writable files in the WP_Error object.
+                       $error_data = version_compare( $old_wp_version, '3.7-beta2', '>' ) ? array_keys( $files_not_writable ) : '';
 
 
+                       if ( $files_not_writable )
+                               return new WP_Error( 'files_not_writable', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), implode( ', ', $error_data ) );
+               }
+       }
+
+       /** This filter is documented in wp-admin/includes/update-core.php */
+       apply_filters( 'update_feedback', __( 'Enabling Maintenance mode…' ) );
        // Create maintenance file to signal that we are upgrading
        $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
        $maintenance_file = $to . '.maintenance';
        $wp_filesystem->delete($maintenance_file);
        $wp_filesystem->put_contents($maintenance_file, $maintenance_string, FS_CHMOD_FILE);
 
        // Create maintenance file to signal that we are upgrading
        $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
        $maintenance_file = $to . '.maintenance';
        $wp_filesystem->delete($maintenance_file);
        $wp_filesystem->put_contents($maintenance_file, $maintenance_string, FS_CHMOD_FILE);
 
+       /** This filter is documented in wp-admin/includes/update-core.php */
+       apply_filters( 'update_feedback', __( 'Copying the required files&#8230;' ) );
        // Copy new versions of WP files into place.
        // Copy new versions of WP files into place.
-       $result = _copy_dir($from . $distro, $to, array('wp-content') );
+       $result = _copy_dir( $from . $distro, $to, $skip );
+       if ( is_wp_error( $result ) )
+               $result = new WP_Error( $result->get_error_code(), $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+
+       // Since we know the core files have copied over, we can now copy the version file
+       if ( ! is_wp_error( $result ) ) {
+               if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $to . 'wp-includes/version.php', true /* overwrite */ ) ) {
+                       $wp_filesystem->delete( $from, true );
+                       $result = new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' );
+               }
+               $wp_filesystem->chmod( $to . 'wp-includes/version.php', FS_CHMOD_FILE );
+       }
+
+       // Check to make sure everything copied correctly, ignoring the contents of wp-content
+       $skip = array( 'wp-content' );
+       $failed = array();
+       if ( isset( $checksums ) && is_array( $checksums ) ) {
+               foreach ( $checksums as $file => $checksum ) {
+                       if ( 'wp-content' == substr( $file, 0, 10 ) )
+                               continue;
+                       if ( ! file_exists( $working_dir_local . $file ) )
+                               continue;
+                       if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum )
+                               $skip[] = $file;
+                       else
+                               $failed[] = $file;
+               }
+       }
+
+       // Some files didn't copy properly
+       if ( ! empty( $failed ) ) {
+               $total_size = 0;
+               foreach ( $failed as $file ) {
+                       if ( file_exists( $working_dir_local . $file ) )
+                               $total_size += filesize( $working_dir_local . $file );
+               }
+
+               // If we don't have enough free space, it isn't worth trying again.
+               // Unlikely to be hit due to the check in unzip_file().
+               $available_space = @disk_free_space( ABSPATH );
+               if ( $available_space && $total_size >= $available_space ) {
+                       $result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ) );
+               } else {
+                       $result = _copy_dir( $from . $distro, $to, $skip );
+                       if ( is_wp_error( $result ) )
+                               $result = new WP_Error( $result->get_error_code() . '_retry', $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+               }
+       }
 
        // Custom Content Directory needs updating now.
        // Copy Languages
 
        // Custom Content Directory needs updating now.
        // Copy Languages
@@ -707,11 +971,19 @@ function update_core($from, $to) {
 
                if ( @is_dir($lang_dir) ) {
                        $wp_lang_dir = $wp_filesystem->find_folder($lang_dir);
 
                if ( @is_dir($lang_dir) ) {
                        $wp_lang_dir = $wp_filesystem->find_folder($lang_dir);
-                       if ( $wp_lang_dir )
+                       if ( $wp_lang_dir ) {
                                $result = copy_dir($from . $distro . 'wp-content/languages/', $wp_lang_dir);
                                $result = copy_dir($from . $distro . 'wp-content/languages/', $wp_lang_dir);
+                               if ( is_wp_error( $result ) )
+                                       $result = new WP_Error( $result->get_error_code() . '_languages', $result->get_error_message(), substr( $result->get_error_data(), strlen( $wp_lang_dir ) ) );
+                       }
                }
        }
 
                }
        }
 
+       /** This filter is documented in wp-admin/includes/update-core.php */
+       apply_filters( 'update_feedback', __( 'Disabling Maintenance mode&#8230;' ) );
+       // Remove maintenance file, we're done with potential site-breaking changes
+       $wp_filesystem->delete( $maintenance_file );
+
        // 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' )  ) {
@@ -745,15 +1017,20 @@ function update_core($from, $to) {
                                                continue;
 
                                        if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )
                                                continue;
 
                                        if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )
-                                               $result = new WP_Error('copy_failed', __('Could not copy file.'), $dest . $filename);
+                                               $result = new WP_Error( "copy_failed_for_new_bundled_$type", __( 'Could not copy file.' ), $dest . $filename );
                                } else {
                                        if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) )
                                                continue;
 
                                        $wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
                                        $_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
                                } else {
                                        if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) )
                                                continue;
 
                                        $wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
                                        $_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
-                                       if ( is_wp_error($_result) ) //If a error occurs partway through this final step, keep the error flowing through, but keep process going.
-                                               $result = $_result;
+
+                                       // If a error occurs partway through this final step, keep the error flowing through, but keep process going.
+                                       if ( is_wp_error( $_result ) ) {
+                                               if ( ! is_wp_error( $result ) )
+                                                       $result = new WP_Error;
+                                               $result->add( $_result->get_error_code() . "_$type", $_result->get_error_message(), substr( $_result->get_error_data(), strlen( $dest ) ) );
+                                       }
                                }
                        }
                } //end foreach
                                }
                        }
                } //end foreach
@@ -761,7 +1038,6 @@ function update_core($from, $to) {
 
        // Handle $result error from the above blocks
        if ( is_wp_error($result) ) {
 
        // Handle $result error from the above blocks
        if ( is_wp_error($result) ) {
-               $wp_filesystem->delete($maintenance_file);
                $wp_filesystem->delete($from, true);
                return $result;
        }
                $wp_filesystem->delete($from, true);
                return $result;
        }
@@ -774,11 +1050,20 @@ function update_core($from, $to) {
                $wp_filesystem->delete($old_file, true);
        }
 
                $wp_filesystem->delete($old_file, true);
        }
 
+       // Remove any Genericons example.html's from the filesystem
+       _upgrade_422_remove_genericons();
+
        // Upgrade DB with separate request
        // Upgrade DB with separate request
-       apply_filters('update_feedback', __('Upgrading database&#8230;'));
+       /** This filter is documented in wp-admin/includes/update-core.php */
+       apply_filters( 'update_feedback', __( 'Upgrading database&#8230;' ) );
        $db_upgrade_url = admin_url('upgrade.php?step=upgrade_db');
        wp_remote_post($db_upgrade_url, array('timeout' => 60));
 
        $db_upgrade_url = admin_url('upgrade.php?step=upgrade_db');
        wp_remote_post($db_upgrade_url, array('timeout' => 60));
 
+       // Clear the cache to prevent an update_option() from saving a stale db_version to the cache
+       wp_cache_flush();
+       // (Not all cache backends listen to 'flush')
+       wp_cache_delete( 'alloptions', 'options' );
+
        // Remove working directory
        $wp_filesystem->delete($from, true);
 
        // Remove working directory
        $wp_filesystem->delete($from, true);
 
@@ -788,12 +1073,19 @@ function update_core($from, $to) {
        else
                delete_option('update_core');
 
        else
                delete_option('update_core');
 
-       // Remove maintenance file, we're done.
-       $wp_filesystem->delete($maintenance_file);
-
-       // If we made it this far:
+       /**
+        * Fires after WordPress core has been successfully updated.
+        *
+        * @since 3.3.0
+        *
+        * @param string $wp_version The current WordPress version.
+        */
        do_action( '_core_updated_successfully', $wp_version );
 
        do_action( '_core_updated_successfully', $wp_version );
 
+       // Clear the option that blocks auto updates after failures, now that we've been successful.
+       if ( function_exists( 'delete_site_option' ) )
+               delete_site_option( 'auto_core_update_failed' );
+
        return $wp_version;
 }
 
        return $wp_version;
 }
 
@@ -801,10 +1093,12 @@ function update_core($from, $to) {
  * Copies a directory from one location to another via the WordPress Filesystem Abstraction.
  * Assumes that WP_Filesystem() has already been called and setup.
  *
  * Copies a directory from one location to another via the WordPress Filesystem Abstraction.
  * Assumes that WP_Filesystem() has already been called and setup.
  *
- * This is a temporary function for the 3.1 -> 3.2 upgrade only and will be removed in 3.3
+ * This is a temporary function for the 3.1 -> 3.2 upgrade, as well as for those upgrading to
+ * 3.7+
  *
  * @ignore
  * @since 3.2.0
  *
  * @ignore
  * @since 3.2.0
+ * @since 3.7.0 Updated not to use a regular expression for the skip list
  * @see copy_dir()
  *
  * @param string $from source directory
  * @see copy_dir()
  *
  * @param string $from source directory
@@ -820,31 +1114,34 @@ function _copy_dir($from, $to, $skip_list = array() ) {
        $from = trailingslashit($from);
        $to = trailingslashit($to);
 
        $from = trailingslashit($from);
        $to = trailingslashit($to);
 
-       $skip_regex = '';
-       foreach ( (array)$skip_list as $key => $skip_file )
-               $skip_regex .= preg_quote($skip_file, '!') . '|';
-
-       if ( !empty($skip_regex) )
-               $skip_regex = '!(' . rtrim($skip_regex, '|') . ')$!i';
-
        foreach ( (array) $dirlist as $filename => $fileinfo ) {
        foreach ( (array) $dirlist as $filename => $fileinfo ) {
-               if ( !empty($skip_regex) )
-                       if ( preg_match($skip_regex, $from . $filename) )
-                               continue;
+               if ( in_array( $filename, $skip_list ) )
+                       continue;
 
                if ( 'f' == $fileinfo['type'] ) {
                        if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
                                // If copy failed, chmod file to 0644 and try again.
 
                if ( 'f' == $fileinfo['type'] ) {
                        if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
                                // If copy failed, chmod file to 0644 and try again.
-                               $wp_filesystem->chmod($to . $filename, 0644);
+                               $wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
                                if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
                                if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-                                       return new WP_Error('copy_failed', __('Could not copy file.'), $to . $filename);
+                                       return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
                        }
                } elseif ( 'd' == $fileinfo['type'] ) {
                        if ( !$wp_filesystem->is_dir($to . $filename) ) {
                                if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
                        }
                } elseif ( 'd' == $fileinfo['type'] ) {
                        if ( !$wp_filesystem->is_dir($to . $filename) ) {
                                if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-                                       return new WP_Error('mkdir_failed', __('Could not create directory.'), $to . $filename);
+                                       return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename );
                        }
                        }
-                       $result = _copy_dir($from . $filename, $to . $filename, $skip_list);
+
+                       /*
+                        * Generate the $sub_skip_list for the subdirectory as a sub-set
+                        * of the existing $skip_list.
+                        */
+                       $sub_skip_list = array();
+                       foreach ( $skip_list as $skip_item ) {
+                               if ( 0 === strpos( $skip_item, $filename . '/' ) )
+                                       $sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+                       }
+
+                       $result = _copy_dir($from . $filename, $to . $filename, $sub_skip_list);
                        if ( is_wp_error($result) )
                                return $result;
                }
                        if ( is_wp_error($result) )
                                return $result;
                }
@@ -866,14 +1163,14 @@ function _redirect_to_about_wordpress( $new_version ) {
        if ( version_compare( $wp_version, '3.4-RC1', '>=' ) )
                return;
 
        if ( version_compare( $wp_version, '3.4-RC1', '>=' ) )
                return;
 
-       // Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts.
+       // Ensure we only run this on the update-core.php page. The Core_Upgrader may be used in other contexts.
        if ( 'update-core.php' != $pagenow )
                return;
 
        if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
                return;
 
        if ( 'update-core.php' != $pagenow )
                return;
 
        if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
                return;
 
-       // Load the updated default text localization domain for new strings
+       // Load the updated default text localization domain for new strings.
        load_default_textdomain();
 
        // See do_core_upgrade()
        load_default_textdomain();
 
        // See do_core_upgrade()
@@ -889,8 +1186,72 @@ window.location = 'about.php?updated';
 </script>
        <?php
 
 </script>
        <?php
 
-       // Include admin-footer.php and exit
+       // Include admin-footer.php and exit.
        include(ABSPATH . 'wp-admin/admin-footer.php');
        exit();
 }
 add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
        include(ABSPATH . 'wp-admin/admin-footer.php');
        exit();
 }
 add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+
+/**
+ * Cleans up Genericons example files.
+ *
+ * @since 4.2.2
+ */
+function _upgrade_422_remove_genericons() {
+       global $wp_theme_directories, $wp_filesystem;
+
+       // A list of the affected files using the filesystem absolute paths.
+       $affected_files = array();
+
+       // Themes
+       foreach ( $wp_theme_directories as $directory ) {
+               $affected_theme_files = _upgrade_422_find_genericons_files_in_folder( $directory );
+               $affected_files       = array_merge( $affected_files, $affected_theme_files );
+       }
+
+       // Plugins
+       $affected_plugin_files = _upgrade_422_find_genericons_files_in_folder( WP_PLUGIN_DIR );
+       $affected_files        = array_merge( $affected_files, $affected_plugin_files );
+
+       foreach ( $affected_files as $file ) {
+               $gen_dir = $wp_filesystem->find_folder( trailingslashit( dirname( $file ) ) );
+               if ( empty( $gen_dir ) ) {
+                       continue;
+               }
+
+               // The path when the file is accessed via WP_Filesystem may differ in the case of FTP
+               $remote_file = $gen_dir . basename( $file );
+
+               if ( ! $wp_filesystem->exists( $remote_file ) ) {
+                       continue;
+               }
+
+               if ( ! $wp_filesystem->delete( $remote_file, false, 'f' ) ) {
+                       $wp_filesystem->put_contents( $remote_file, '' );
+               }
+       }
+}
+
+/**
+ * Recursively find Genericons example files in a given folder.
+ *
+ * @ignore
+ * @since 4.2.2
+ *
+ * @param string $directory Directory path. Expects trailingslashed.
+ * @return array
+ */
+function _upgrade_422_find_genericons_files_in_folder( $directory ) {
+       $directory = trailingslashit( $directory );
+       $files     = array();
+
+       if ( file_exists( "{$directory}example.html" ) && false !== strpos( file_get_contents( "{$directory}example.html" ), '<title>Genericons</title>' ) ) {
+               $files[] = "{$directory}example.html";
+       }
+
+       foreach ( glob( $directory . '*', GLOB_ONLYDIR ) as $dir ) {
+               $files = array_merge( $files, _upgrade_422_find_genericons_files_in_folder( $dir ) );
+       }
+
+       return $files;
+}