Wordpress 3.7

[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 46979d78b9ede21ee40b3fe925eca0d1643c3803..52ef1fd4498e2a946017883ffba556fb14bf8515 100644 (file)
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -18,13 +18,74 @@
 global $_old_files;
 
 $_old_files = array(
 global $_old_files;
 
 $_old_files = array(

-'wp-admin/bookmarklet.php',
+// 2.0
+'wp-admin/import-b2.php',
+'wp-admin/import-blogger.php',
+'wp-admin/import-greymatter.php',
+'wp-admin/import-livejournal.php',
+'wp-admin/import-mt.php',
+'wp-admin/import-rss.php',
+'wp-admin/import-textpattern.php',
+'wp-admin/quicktags.js',
+'wp-images/fade-butt.png',
+'wp-images/get-firefox.png',
+'wp-images/header-shadow.png',
+'wp-images/smilies',
+'wp-images/wp-small.png',
+'wp-images/wpminilogo.png',
+'wp.php',
+// 2.0.8
+'wp-includes/js/tinymce/plugins/inlinepopups/readme.txt',
+// 2.1
+'wp-admin/edit-form-ajax-cat.php',
+'wp-admin/execute-pings.php',
+'wp-admin/inline-uploading.php',
+'wp-admin/link-categories.php',
+'wp-admin/list-manipulation.js',
+'wp-admin/list-manipulation.php',
+'wp-includes/comment-functions.php',
+'wp-includes/feed-functions.php',
+'wp-includes/functions-compat.php',
+'wp-includes/functions-formatting.php',
+'wp-includes/functions-post.php',
+'wp-includes/js/dbx-key.js',
+'wp-includes/js/tinymce/plugins/autosave/langs/cs.js',
+'wp-includes/js/tinymce/plugins/autosave/langs/sv.js',
+'wp-includes/links.php',
+'wp-includes/pluggable-functions.php',
+'wp-includes/template-functions-author.php',
+'wp-includes/template-functions-category.php',
+'wp-includes/template-functions-general.php',
+'wp-includes/template-functions-links.php',
+'wp-includes/template-functions-post.php',
+'wp-includes/wp-l10n.php',
+// 2.2
+'wp-admin/cat-js.php',
+'wp-admin/import/b2.php',
+'wp-includes/js/autosave-js.php',
+'wp-includes/js/list-manipulation-js.php',
+'wp-includes/js/wp-ajax-js.php',
+// 2.3
+'wp-admin/admin-db.php',
+'wp-admin/cat.js',
+'wp-admin/categories.js',
+'wp-admin/custom-fields.js',
+'wp-admin/dbx-admin-key.js',
+'wp-admin/edit-comments.js',
+'wp-admin/install-rtl.css',
+'wp-admin/install.css',
+'wp-admin/upgrade-schema.php',
+'wp-admin/upload-functions.php',
+'wp-admin/upload-rtl.css',
+'wp-admin/upload.css',
+'wp-admin/upload.js',
+'wp-admin/users.js',
+'wp-admin/widgets-rtl.css',
+'wp-admin/widgets.css',
+'wp-admin/xfn.js',
+'wp-includes/js/tinymce/license.html',
+// 2.5

 'wp-admin/css/upload.css',
 'wp-admin/css/upload.css',

-'wp-admin/css/upload-rtl.css',
-'wp-admin/css/press-this-ie.css',
-'wp-admin/css/press-this-ie-rtl.css',
-'wp-admin/edit-form.php',
-'wp-admin/link-import.php',

 'wp-admin/images/box-bg-left.gif',
 'wp-admin/images/box-bg-right.gif',
 'wp-admin/images/box-bg.gif',
 'wp-admin/images/box-bg-left.gif',
 'wp-admin/images/box-bg-right.gif',
 'wp-admin/images/box-bg.gif',


@@ -39,47 +100,17 @@ $_old_files = array(
 'wp-admin/images/login-bkg-tile.gif',
 'wp-admin/images/notice.gif',
 'wp-admin/images/toggle.gif',
 'wp-admin/images/login-bkg-tile.gif',
 'wp-admin/images/notice.gif',
 'wp-admin/images/toggle.gif',

-'wp-admin/images/comment-stalk-classic.gif',
-'wp-admin/images/comment-stalk-fresh.gif',
-'wp-admin/images/comment-stalk-rtl.gif',
-'wp-admin/images/comment-pill.gif',
-'wp-admin/images/del.png',
-'wp-admin/images/media-button-gallery.gif',
-'wp-admin/images/media-buttons.gif',
-'wp-admin/images/tail.gif',
-'wp-admin/images/gear.png',
-'wp-admin/images/tab.png',
-'wp-admin/images/postbox-bg.gif',

 'wp-admin/includes/upload.php',
 'wp-admin/js/dbx-admin-key.js',
 'wp-admin/js/link-cat.js',
 'wp-admin/includes/upload.php',
 'wp-admin/js/dbx-admin-key.js',
 'wp-admin/js/link-cat.js',

-'wp-admin/js/forms.js',
-'wp-admin/js/upload.js',
-'wp-admin/js/set-post-thumbnail-handler.js',
-'wp-admin/js/set-post-thumbnail-handler.dev.js',
-'wp-admin/js/page.js',
-'wp-admin/js/page.dev.js',
-'wp-admin/js/slug.js',
-'wp-admin/js/slug.dev.js',

 'wp-admin/profile-update.php',
 'wp-admin/templates.php',
 'wp-admin/profile-update.php',
 'wp-admin/templates.php',

-'wp-includes/images/audio.png',
-'wp-includes/images/css.png',
-'wp-includes/images/default.png',
-'wp-includes/images/doc.png',
-'wp-includes/images/exe.png',
-'wp-includes/images/html.png',
-'wp-includes/images/js.png',
-'wp-includes/images/pdf.png',
-'wp-includes/images/swf.png',
-'wp-includes/images/tar.png',
-'wp-includes/images/text.png',
-'wp-includes/images/video.png',
-'wp-includes/images/zip.png',
+'wp-includes/images/wlw/WpComments.png',
+'wp-includes/images/wlw/WpIcon.png',
+'wp-includes/images/wlw/WpWatermark.png',

 'wp-includes/js/dbx.js',
 'wp-includes/js/fat.js',
 'wp-includes/js/list-manipulation.js',
 'wp-includes/js/dbx.js',
 'wp-includes/js/fat.js',
 'wp-includes/js/list-manipulation.js',

-'wp-includes/js/jquery/jquery.dimensions.min.js',

 'wp-includes/js/tinymce/langs/en.js',
 'wp-includes/js/tinymce/plugins/autosave/editor_plugin_src.js',
 'wp-includes/js/tinymce/plugins/autosave/langs',
 'wp-includes/js/tinymce/langs/en.js',
 'wp-includes/js/tinymce/plugins/autosave/editor_plugin_src.js',
 'wp-includes/js/tinymce/plugins/autosave/langs',


@@ -101,78 +132,83 @@ $_old_files = array(
 'wp-includes/js/tinymce/plugins/spellchecker/tinyspell.php',
 'wp-includes/js/tinymce/plugins/wordpress/images',
 'wp-includes/js/tinymce/plugins/wordpress/langs',
 'wp-includes/js/tinymce/plugins/spellchecker/tinyspell.php',
 'wp-includes/js/tinymce/plugins/wordpress/images',
 'wp-includes/js/tinymce/plugins/wordpress/langs',

-'wp-includes/js/tinymce/plugins/wordpress/popups.css',

 'wp-includes/js/tinymce/plugins/wordpress/wordpress.css',
 'wp-includes/js/tinymce/plugins/wphelp',
 'wp-includes/js/tinymce/themes/advanced/css',
 'wp-includes/js/tinymce/themes/advanced/images',
 'wp-includes/js/tinymce/themes/advanced/jscripts',
 'wp-includes/js/tinymce/themes/advanced/langs',
 'wp-includes/js/tinymce/plugins/wordpress/wordpress.css',
 'wp-includes/js/tinymce/plugins/wphelp',
 'wp-includes/js/tinymce/themes/advanced/css',
 'wp-includes/js/tinymce/themes/advanced/images',
 'wp-includes/js/tinymce/themes/advanced/jscripts',
 'wp-includes/js/tinymce/themes/advanced/langs',

+// 2.5.1

 'wp-includes/js/tinymce/tiny_mce_gzip.php',
 'wp-includes/js/tinymce/tiny_mce_gzip.php',

+// 2.6
+'wp-admin/bookmarklet.php',
+'wp-includes/js/jquery/jquery.dimensions.min.js',
+'wp-includes/js/tinymce/plugins/wordpress/popups.css',

 'wp-includes/js/wp-ajax.js',
 'wp-includes/js/wp-ajax.js',

-'wp-admin/admin-db.php',
-'wp-admin/cat.js',
-'wp-admin/categories.js',
-'wp-admin/custom-fields.js',
-'wp-admin/dbx-admin-key.js',
-'wp-admin/edit-comments.js',
-'wp-admin/install-rtl.css',
-'wp-admin/install.css',
-'wp-admin/upgrade-schema.php',
-'wp-admin/upload-functions.php',
-'wp-admin/upload-rtl.css',
-'wp-admin/upload.css',
-'wp-admin/upload.js',
-'wp-admin/users.js',
-'wp-admin/widgets-rtl.css',
-'wp-admin/widgets.css',
-'wp-admin/xfn.js',
-'wp-includes/js/tinymce/license.html',
-'wp-admin/cat-js.php',
-'wp-admin/edit-form-ajax-cat.php',
-'wp-admin/execute-pings.php',
-'wp-admin/import/b2.php',
+// 2.7
+'wp-admin/css/press-this-ie-rtl.css',
+'wp-admin/css/press-this-ie.css',
+'wp-admin/css/upload-rtl.css',
+'wp-admin/edit-form.php',
+'wp-admin/images/comment-pill.gif',
+'wp-admin/images/comment-stalk-classic.gif',
+'wp-admin/images/comment-stalk-fresh.gif',
+'wp-admin/images/comment-stalk-rtl.gif',
+'wp-admin/images/del.png',
+'wp-admin/images/gear.png',
+'wp-admin/images/media-button-gallery.gif',
+'wp-admin/images/media-buttons.gif',
+'wp-admin/images/postbox-bg.gif',
+'wp-admin/images/tab.png',
+'wp-admin/images/tail.gif',
+'wp-admin/js/forms.js',
+'wp-admin/js/upload.js',
+'wp-admin/link-import.php',
+'wp-includes/images/audio.png',
+'wp-includes/images/css.png',
+'wp-includes/images/default.png',
+'wp-includes/images/doc.png',
+'wp-includes/images/exe.png',
+'wp-includes/images/html.png',
+'wp-includes/images/js.png',
+'wp-includes/images/pdf.png',
+'wp-includes/images/swf.png',
+'wp-includes/images/tar.png',
+'wp-includes/images/text.png',
+'wp-includes/images/video.png',
+'wp-includes/images/zip.png',
+'wp-includes/js/tinymce/tiny_mce_config.php',
+'wp-includes/js/tinymce/tiny_mce_ext.js',
+// 2.8
+'wp-admin/js/users.js',
+'wp-includes/js/swfupload/plugins/swfupload.documentready.js',
+'wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js',
+'wp-includes/js/swfupload/swfupload_f9.swf',
+'wp-includes/js/tinymce/plugins/autosave',
+'wp-includes/js/tinymce/plugins/paste/css',
+'wp-includes/js/tinymce/utils/mclayer.js',
+'wp-includes/js/tinymce/wordpress.css',
+// 2.8.5

 'wp-admin/import/btt.php',
 'wp-admin/import/jkw.php',
 'wp-admin/import/btt.php',
 'wp-admin/import/jkw.php',

-'wp-admin/inline-uploading.php',
-'wp-admin/link-categories.php',
-'wp-admin/list-manipulation.js',
-'wp-admin/list-manipulation.php',
-'wp-includes/comment-functions.php',
-'wp-includes/feed-functions.php',
-'wp-includes/functions-compat.php',
-'wp-includes/functions-formatting.php',
-'wp-includes/functions-post.php',
-'wp-includes/js/dbx-key.js',
-'wp-includes/js/tinymce/plugins/autosave/langs/cs.js',
-'wp-includes/js/tinymce/plugins/autosave/langs/sv.js',
-'wp-includes/js/tinymce/themes/advanced/editor_template_src.js',
-'wp-includes/links.php',
-'wp-includes/pluggable-functions.php',
-'wp-includes/template-functions-author.php',
-'wp-includes/template-functions-category.php',
-'wp-includes/template-functions-general.php',
-'wp-includes/template-functions-links.php',
-'wp-includes/template-functions-post.php',
-'wp-includes/wp-l10n.php',
-'wp-admin/import-b2.php',
-'wp-admin/import-blogger.php',
-'wp-admin/import-greymatter.php',
-'wp-admin/import-livejournal.php',
-'wp-admin/import-mt.php',
-'wp-admin/import-rss.php',
-'wp-admin/import-textpattern.php',
-'wp-admin/quicktags.js',
-'wp-images/fade-butt.png',
-'wp-images/get-firefox.png',
-'wp-images/header-shadow.png',
-'wp-images/smilies',
-'wp-images/wp-small.png',
-'wp-images/wpminilogo.png',
-'wp.php',
+// 2.9
+'wp-admin/js/page.dev.js',
+'wp-admin/js/page.js',
+'wp-admin/js/set-post-thumbnail-handler.dev.js',
+'wp-admin/js/set-post-thumbnail-handler.js',
+'wp-admin/js/slug.dev.js',
+'wp-admin/js/slug.js',

 'wp-includes/gettext.php',
 'wp-includes/gettext.php',

+'wp-includes/js/tinymce/plugins/wordpress/js',

 'wp-includes/streams.php',
 // MU
 'wp-includes/streams.php',
 // MU

+'README.txt',
+'htaccess.dist',
+'index-install.php',
+'wp-admin/css/mu-rtl.css',
+'wp-admin/css/mu.css',
+'wp-admin/images/site-admin.png',
+'wp-admin/includes/mu.php',

 'wp-admin/wpmu-admin.php',
 'wp-admin/wpmu-blogs.php',
 'wp-admin/wpmu-edit.php',
 'wp-admin/wpmu-admin.php',
 'wp-admin/wpmu-blogs.php',
 'wp-admin/wpmu-edit.php',


@@ -180,23 +216,26 @@ $_old_files = array(
 'wp-admin/wpmu-themes.php',
 'wp-admin/wpmu-upgrade-site.php',
 'wp-admin/wpmu-users.php',
 'wp-admin/wpmu-themes.php',
 'wp-admin/wpmu-upgrade-site.php',
 'wp-admin/wpmu-users.php',

+'wp-includes/images/wordpress-mu.png',

 'wp-includes/wpmu-default-filters.php',
 'wp-includes/wpmu-functions.php',
 'wpmu-settings.php',
 'wp-includes/wpmu-default-filters.php',
 'wp-includes/wpmu-functions.php',
 'wpmu-settings.php',

-'index-install.php',
-'README.txt',
-'htaccess.dist',
-'wp-admin/css/mu-rtl.css',
-'wp-admin/css/mu.css',
-'wp-admin/images/site-admin.png',
-'wp-admin/includes/mu.php',
-'wp-includes/images/wordpress-mu.png',

 // 3.0
 'wp-admin/categories.php',
 'wp-admin/edit-category-form.php',
 'wp-admin/edit-page-form.php',
 'wp-admin/edit-pages.php',
 // 3.0
 'wp-admin/categories.php',
 'wp-admin/edit-category-form.php',
 'wp-admin/edit-page-form.php',
 'wp-admin/edit-pages.php',

+'wp-admin/images/admin-header-footer.png',
+'wp-admin/images/browse-happy.gif',
+'wp-admin/images/ico-add.png',
+'wp-admin/images/ico-close.png',
+'wp-admin/images/ico-edit.png',
+'wp-admin/images/ico-viewpage.png',
+'wp-admin/images/fav-top.png',
+'wp-admin/images/screen-options-left.gif',
+'wp-admin/images/wp-logo-vs.gif',

 'wp-admin/images/wp-logo.gif',
 'wp-admin/images/wp-logo.gif',

+'wp-admin/import',

 'wp-admin/js/wp-gears.dev.js',
 'wp-admin/js/wp-gears.js',
 'wp-admin/options-misc.php',
 'wp-admin/js/wp-gears.dev.js',
 'wp-admin/js/wp-gears.js',
 'wp-admin/options-misc.php',


@@ -208,51 +247,46 @@ $_old_files = array(
 'wp-admin/wp-admin.css',
 'wp-admin/wp-admin.dev.css',
 'wp-includes/js/codepress',
 'wp-admin/wp-admin.css',
 'wp-admin/wp-admin.dev.css',
 'wp-includes/js/codepress',

+'wp-includes/js/codepress/engines/khtml.js',
+'wp-includes/js/codepress/engines/older.js',

 'wp-includes/js/jquery/autocomplete.dev.js',
 'wp-includes/js/jquery/autocomplete.dev.js',

-'wp-includes/js/jquery/interface.js',

 'wp-includes/js/jquery/autocomplete.js',
 'wp-includes/js/jquery/autocomplete.js',

+'wp-includes/js/jquery/interface.js',

 'wp-includes/js/scriptaculous/prototype.js',
 'wp-includes/js/tinymce/wp-tinymce.js',
 'wp-includes/js/scriptaculous/prototype.js',
 'wp-includes/js/tinymce/wp-tinymce.js',

-'wp-admin/import',
-'wp-admin/images/ico-edit.png',
-'wp-admin/images/fav-top.png',
-'wp-admin/images/ico-close.png',
-'wp-admin/images/admin-header-footer.png',
-'wp-admin/images/screen-options-left.gif',
-'wp-admin/images/ico-add.png',
-'wp-admin/images/browse-happy.gif',
-'wp-admin/images/ico-viewpage.png',

 // 3.1
 // 3.1

-'wp-includes/js/tinymce/blank.htm',
-'wp-includes/js/tinymce/plugins/safari',
-'wp-admin/edit-link-categories.php',
-'wp-admin/edit-post-rows.php',

 'wp-admin/edit-attachment-rows.php',
 'wp-admin/edit-attachment-rows.php',

-'wp-admin/link-category.php',
+'wp-admin/edit-link-categories.php',

 'wp-admin/edit-link-category-form.php',
 'wp-admin/edit-link-category-form.php',

-'wp-admin/sidebar.php',
-'wp-admin/images/list-vs.png',
-'wp-admin/images/button-grad-vs.png',
+'wp-admin/edit-post-rows.php',

 'wp-admin/images/button-grad-active-vs.png',
 'wp-admin/images/button-grad-active-vs.png',

-'wp-admin/images/fav-arrow-vs.gif',
+'wp-admin/images/button-grad-vs.png',

 'wp-admin/images/fav-arrow-vs-rtl.gif',
 'wp-admin/images/fav-arrow-vs-rtl.gif',

+'wp-admin/images/fav-arrow-vs.gif',

 'wp-admin/images/fav-top-vs.gif',
 'wp-admin/images/fav-top-vs.gif',

-'wp-admin/images/screen-options-right.gif',
+'wp-admin/images/list-vs.png',

 'wp-admin/images/screen-options-right-up.gif',
 'wp-admin/images/screen-options-right-up.gif',

+'wp-admin/images/screen-options-right.gif',

 'wp-admin/images/visit-site-button-grad-vs.gif',
 'wp-admin/images/visit-site-button-grad.gif',
 'wp-admin/images/visit-site-button-grad-vs.gif',
 'wp-admin/images/visit-site-button-grad.gif',

+'wp-admin/link-category.php',
+'wp-admin/sidebar.php',

 'wp-includes/classes.php',
 'wp-includes/classes.php',

+'wp-includes/js/tinymce/blank.htm',
+'wp-includes/js/tinymce/plugins/media/css/content.css',
+'wp-includes/js/tinymce/plugins/media/img',
+'wp-includes/js/tinymce/plugins/safari',

 // 3.2
 // 3.2

+'wp-admin/images/logo-login.gif',
+'wp-admin/images/star.gif',
+'wp-admin/js/list-table.dev.js',
+'wp-admin/js/list-table.js',

 'wp-includes/default-embeds.php',
 'wp-includes/default-embeds.php',

+'wp-includes/js/tinymce/plugins/wordpress/img/help.gif',

 'wp-includes/js/tinymce/plugins/wordpress/img/more.gif',
 'wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif',
 'wp-includes/js/tinymce/plugins/wordpress/img/more.gif',
 'wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif',

-'wp-includes/js/tinymce/plugins/wordpress/img/help.gif',

 'wp-includes/js/tinymce/themes/advanced/img/fm.gif',
 'wp-includes/js/tinymce/themes/advanced/img/sflogo.png',
 'wp-includes/js/tinymce/themes/advanced/img/fm.gif',
 'wp-includes/js/tinymce/themes/advanced/img/sflogo.png',

-'wp-admin/js/list-table.js',
-'wp-admin/js/list-table.dev.js',
-'wp-admin/images/logo-login.gif',
-'wp-admin/images/star.gif',

 // 3.3
 'wp-admin/css/colors-classic-rtl.css',
 'wp-admin/css/colors-classic-rtl.dev.css',
 // 3.3
 'wp-admin/css/colors-classic-rtl.css',
 'wp-admin/css/colors-classic-rtl.dev.css',


@@ -324,6 +358,210 @@ $_old_files = array(
 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif',
 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png',
 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.gif',
 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif',
 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png',
 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.gif',

+// Don't delete, yet: 'wp-rss.php',
+// Don't delete, yet: 'wp-rdf.php',
+// Don't delete, yet: 'wp-rss2.php',
+// Don't delete, yet: 'wp-commentsrss2.php',
+// Don't delete, yet: 'wp-atom.php',
+// Don't delete, yet: 'wp-feed.php',
+// 3.4
+'wp-admin/images/gray-star.png',
+'wp-admin/images/logo-login.png',
+'wp-admin/images/star.png',
+'wp-admin/index-extra.php',
+'wp-admin/network/index-extra.php',
+'wp-admin/user/index-extra.php',
+'wp-admin/images/screenshots/admin-flyouts.png',
+'wp-admin/images/screenshots/coediting.png',
+'wp-admin/images/screenshots/drag-and-drop.png',
+'wp-admin/images/screenshots/help-screen.png',
+'wp-admin/images/screenshots/media-icon.png',
+'wp-admin/images/screenshots/new-feature-pointer.png',
+'wp-admin/images/screenshots/welcome-screen.png',
+'wp-includes/css/editor-buttons.css',
+'wp-includes/css/editor-buttons.dev.css',
+'wp-includes/js/tinymce/plugins/paste/blank.htm',
+'wp-includes/js/tinymce/plugins/wordpress/css',
+'wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js',
+'wp-includes/js/tinymce/plugins/wordpress/img/embedded.png',
+'wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif',
+'wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif',
+'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.dev.js',
+'wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css',
+'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js',
+'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js',
+'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js',
+'wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png',
+'wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js',
+// Don't delete, yet: 'wp-pass.php',
+// Don't delete, yet: 'wp-register.php',
+// 3.5
+'wp-admin/gears-manifest.php',
+'wp-admin/includes/manifest.php',
+'wp-admin/images/archive-link.png',
+'wp-admin/images/blue-grad.png',
+'wp-admin/images/button-grad-active.png',
+'wp-admin/images/button-grad.png',
+'wp-admin/images/ed-bg-vs.gif',
+'wp-admin/images/ed-bg.gif',
+'wp-admin/images/fade-butt.png',
+'wp-admin/images/fav-arrow-rtl.gif',
+'wp-admin/images/fav-arrow.gif',
+'wp-admin/images/fav-vs.png',
+'wp-admin/images/fav.png',
+'wp-admin/images/gray-grad.png',
+'wp-admin/images/loading-publish.gif',
+'wp-admin/images/logo-ghost.png',
+'wp-admin/images/logo.gif',
+'wp-admin/images/menu-arrow-frame-rtl.png',
+'wp-admin/images/menu-arrow-frame.png',
+'wp-admin/images/menu-arrows.gif',
+'wp-admin/images/menu-bits-rtl-vs.gif',
+'wp-admin/images/menu-bits-rtl.gif',
+'wp-admin/images/menu-bits-vs.gif',
+'wp-admin/images/menu-bits.gif',
+'wp-admin/images/menu-dark-rtl-vs.gif',
+'wp-admin/images/menu-dark-rtl.gif',
+'wp-admin/images/menu-dark-vs.gif',
+'wp-admin/images/menu-dark.gif',
+'wp-admin/images/required.gif',
+'wp-admin/images/screen-options-toggle-vs.gif',
+'wp-admin/images/screen-options-toggle.gif',
+'wp-admin/images/toggle-arrow-rtl.gif',
+'wp-admin/images/toggle-arrow.gif',
+'wp-admin/images/upload-classic.png',
+'wp-admin/images/upload-fresh.png',
+'wp-admin/images/white-grad-active.png',
+'wp-admin/images/white-grad.png',
+'wp-admin/images/widgets-arrow-vs.gif',
+'wp-admin/images/widgets-arrow.gif',
+'wp-admin/images/wpspin_dark.gif',
+'wp-includes/images/upload.png',
+'wp-includes/js/prototype.js',
+'wp-includes/js/scriptaculous',
+'wp-admin/css/wp-admin-rtl.dev.css',
+'wp-admin/css/wp-admin.dev.css',
+'wp-admin/css/media-rtl.dev.css',
+'wp-admin/css/media.dev.css',
+'wp-admin/css/colors-classic.dev.css',
+'wp-admin/css/customize-controls-rtl.dev.css',
+'wp-admin/css/customize-controls.dev.css',
+'wp-admin/css/ie-rtl.dev.css',
+'wp-admin/css/ie.dev.css',
+'wp-admin/css/install.dev.css',
+'wp-admin/css/colors-fresh.dev.css',
+'wp-includes/js/customize-base.dev.js',
+'wp-includes/js/json2.dev.js',
+'wp-includes/js/comment-reply.dev.js',
+'wp-includes/js/customize-preview.dev.js',
+'wp-includes/js/wplink.dev.js',
+'wp-includes/js/tw-sack.dev.js',
+'wp-includes/js/wp-list-revisions.dev.js',
+'wp-includes/js/autosave.dev.js',
+'wp-includes/js/admin-bar.dev.js',
+'wp-includes/js/quicktags.dev.js',
+'wp-includes/js/wp-ajax-response.dev.js',
+'wp-includes/js/wp-pointer.dev.js',
+'wp-includes/js/hoverIntent.dev.js',
+'wp-includes/js/colorpicker.dev.js',
+'wp-includes/js/wp-lists.dev.js',
+'wp-includes/js/customize-loader.dev.js',
+'wp-includes/js/jquery/jquery.table-hotkeys.dev.js',
+'wp-includes/js/jquery/jquery.color.dev.js',
+'wp-includes/js/jquery/jquery.color.js',
+'wp-includes/js/jquery/jquery.hotkeys.dev.js',
+'wp-includes/js/jquery/jquery.form.dev.js',
+'wp-includes/js/jquery/suggest.dev.js',
+'wp-admin/js/xfn.dev.js',
+'wp-admin/js/set-post-thumbnail.dev.js',
+'wp-admin/js/comment.dev.js',
+'wp-admin/js/theme.dev.js',
+'wp-admin/js/cat.dev.js',
+'wp-admin/js/password-strength-meter.dev.js',
+'wp-admin/js/user-profile.dev.js',
+'wp-admin/js/theme-preview.dev.js',
+'wp-admin/js/post.dev.js',
+'wp-admin/js/media-upload.dev.js',
+'wp-admin/js/word-count.dev.js',
+'wp-admin/js/plugin-install.dev.js',
+'wp-admin/js/edit-comments.dev.js',
+'wp-admin/js/media-gallery.dev.js',
+'wp-admin/js/custom-fields.dev.js',
+'wp-admin/js/custom-background.dev.js',
+'wp-admin/js/common.dev.js',
+'wp-admin/js/inline-edit-tax.dev.js',
+'wp-admin/js/gallery.dev.js',
+'wp-admin/js/utils.dev.js',
+'wp-admin/js/widgets.dev.js',
+'wp-admin/js/wp-fullscreen.dev.js',
+'wp-admin/js/nav-menu.dev.js',
+'wp-admin/js/dashboard.dev.js',
+'wp-admin/js/link.dev.js',
+'wp-admin/js/user-suggest.dev.js',
+'wp-admin/js/postbox.dev.js',
+'wp-admin/js/tags.dev.js',
+'wp-admin/js/image-edit.dev.js',
+'wp-admin/js/media.dev.js',
+'wp-admin/js/customize-controls.dev.js',
+'wp-admin/js/inline-edit-post.dev.js',
+'wp-admin/js/categories.dev.js',
+'wp-admin/js/editor.dev.js',
+'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js',
+'wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js',
+'wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js',
+'wp-includes/js/plupload/handlers.dev.js',
+'wp-includes/js/plupload/wp-plupload.dev.js',
+'wp-includes/js/swfupload/handlers.dev.js',
+'wp-includes/js/jcrop/jquery.Jcrop.dev.js',
+'wp-includes/js/jcrop/jquery.Jcrop.js',
+'wp-includes/js/jcrop/jquery.Jcrop.css',
+'wp-includes/js/imgareaselect/jquery.imgareaselect.dev.js',
+'wp-includes/css/wp-pointer.dev.css',
+'wp-includes/css/editor.dev.css',
+'wp-includes/css/jquery-ui-dialog.dev.css',
+'wp-includes/css/admin-bar-rtl.dev.css',
+'wp-includes/css/admin-bar.dev.css',
+'wp-includes/js/jquery/ui/jquery.effects.clip.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.scale.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.blind.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.core.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.shake.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.fade.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.explode.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.slide.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.drop.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.highlight.min.js',
+'wp-includes/js/jquery/ui/jquery.effects.bounce.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-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.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',

 );
 
 /**
 );
 
 /**


@@ -335,7 +573,7 @@ $_old_files = array(
  * introduced version present here being older than the current installed version.
  *
  * The content of this array should follow the following format:
  * introduced version present here being older than the current installed version.
  *
  * The content of this array should follow the following format:

- *  Filename (relative to wp-content) => Introduced version
+ * Filename (relative to wp-content) => Introduced version

  * Directories should be noted by suffixing it with a trailing slash (/)
  *
  * @since 3.2.0
  * Directories should be noted by suffixing it with a trailing slash (/)
  *
  * @since 3.2.0


@@ -346,9 +584,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'
+       'plugins/akismet/'       => '2.0',
+       'themes/twentyten/'      => '3.0',
+       'themes/twentyeleven/'   => '3.2',
+       'themes/twentytwelve/'   => '3.5',
+       'themes/twentythirteen/' => '3.6',

 );
 
 /**
 );
 
 /**


@@ -402,11 +642,37 @@ 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…') );
+       $distro = '';
+       $roots = array( '/wordpress/', '/wordpress-mu/' );
+       foreach ( $roots as $root ) {
+               if ( $wp_filesystem->exists( $from . $root . 'readme.html' ) && $wp_filesystem->exists( $from . $root . 'wp-includes/version.php' ) ) {
+                       $distro = $root;
+                       break;
+               }
+       }
+       if ( ! $distro ) {
+               $wp_filesystem->delete( $from, true );
+               return new WP_Error( 'insane_distro', __('The update could not be unpacked') );
+       }
+
+       // Import $wp_version, $required_php_version, and $required_mysql_version from the new version
+       // $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 );
+                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 );
+       require( WP_CONTENT_DIR . '/upgrade/version-current.php' );
+       $wp_filesystem->delete( $versions_file );
+

        $php_version    = phpversion();
        $mysql_version  = $wpdb->db_version();
        $php_version    = phpversion();
        $mysql_version  = $wpdb->db_version();

-       $required_php_version = '5.2.4';
-       $required_mysql_version = '5.0';
-       $wp_version = '3.3.1';
+       $old_wp_version = $GLOBALS['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 ) )
                $mysql_compat = true;
        $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
        if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
                $mysql_compat = true;


@@ -423,31 +689,100 @@ 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 ) );
 

-       // Sanity check the unzipped distribution
-       apply_filters('update_feedback', __('Verifying the unpacked files…'));
-       $distro = '';
-       $roots = array( '/wordpress/', '/wordpress-mu/' );
-       foreach( $roots as $root ) {
-               if ( $wp_filesystem->exists($from . $root . 'readme.html') && $wp_filesystem->exists($from . $root . 'wp-includes/version.php') ) {
-                       $distro = $root;
-                       break;
+       apply_filters( 'update_feedback', __( 'Preparing to install the latest version…' ) );
+
+       // Don't copy wp-content, we'll deal with that below
+       $skip = array( 'wp-content' );
+       $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' ) ) {
+               $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 ( md5_file( ABSPATH . $file ) === $checksum )
+                                       $skip[] = $file;
+                               else
+                                       $check_is_writable[ $file ] = ABSPATH . $file;
+                       }

                }
        }
                }
        }

-       if ( !$distro ) {
-               $wp_filesystem->delete($from, true);
-               return new WP_Error('insane_distro', __('The update could not be unpacked') );
-       }

 
 

-       apply_filters('update_feedback', __('Installing the latest version…'));
+       // 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 ) );
+               }
+       }

 
 

+       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);
 

+       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 ) ) );
+
+       // Check to make sure everything copied correctly, ignoring the contents of wp-content
+       $skip = array( 'wp-content' );
+       $failed = array();
+       if ( is_array( $checksums ) ) {
+               foreach ( $checksums as $file => $checksum ) {
+                       if ( 0 === strpos( $file, 'wp-content' ) )
+                               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;
+               // Find the local version of the working directory
+               $working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro;
+               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


@@ -464,21 +799,39 @@ 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 ) ) );
+                       }
+               }
+       }
+
+       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' )  ) {
+                       $wp_filesystem->delete( $wp_filesystem->wp_themes_dir() . 'twentytwelve/' );

                }
        }
 
        // Copy New bundled plugins & themes
        // This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.
                }
        }
 
        // Copy New bundled plugins & themes
        // This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.

+       // $development_build controls us overwriting bundled themes and plugins when a non-stable release is being updated

        if ( !is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
        if ( !is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {

-               $old_version = $GLOBALS['wp_version']; // $wp_version in local scope == new version

                foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {
                foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {

-                       // If $introduced version is greater than what the site was previously running
-                       if ( version_compare($introduced_version, $old_version, '>') ) {
+                       // If a $development_build or if $introduced version is greater than what the site was previously running
+                       if ( $development_build || version_compare( $introduced_version, $old_wp_version, '>' ) ) {

                                $directory = ('/' == $file[ strlen($file)-1 ]);
                                list($type, $filename) = explode('/', $file, 2);
 
                                $directory = ('/' == $file[ strlen($file)-1 ]);
                                list($type, $filename) = explode('/', $file, 2);
 

+                               // Check to see if the bundled items exist before attempting to copy them
+                               if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) )
+                                       continue;
+

                                if ( 'plugins' == $type )
                                        $dest = $wp_filesystem->wp_plugins_dir();
                                elseif ( 'themes' == $type )
                                if ( 'plugins' == $type )
                                        $dest = $wp_filesystem->wp_plugins_dir();
                                elseif ( 'themes' == $type )


@@ -487,19 +840,24 @@ function update_core($from, $to) {
                                        continue;
 
                                if ( ! $directory ) {
                                        continue;
 
                                if ( ! $directory ) {

-                                       if ( $wp_filesystem->exists($dest . $filename) )
+                                       if ( ! $development_build && $wp_filesystem->exists( $dest . $filename ) )

                                                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 {
                                } else {

-                                       if ( $wp_filesystem->is_dir($dest . $filename) )
+                                       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);
                                                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


@@ -507,7 +865,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;
        }


@@ -534,12 +891,13 @@ 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:
        do_action( '_core_updated_successfully', $wp_version );
 
        // If we made it this far:
        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;
 }
 


@@ -547,10 +905,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


@@ -566,31 +926,31 @@ 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;
                }


@@ -601,7 +961,7 @@ function _copy_dir($from, $to, $skip_list = array() ) {
 /**
  * Redirect to the About WordPress page after a successful upgrade.
  *
 /**
  * Redirect to the About WordPress page after a successful upgrade.
  *

- * This function is only needed when the existing install is older than 3.3.0.
+ * This function is only needed when the existing install is older than 3.4.0.

  *
  * @since 3.3.0
  *
  *
  * @since 3.3.0
  *


@@ -609,10 +969,10 @@ function _copy_dir($from, $to, $skip_list = array() ) {
 function _redirect_to_about_wordpress( $new_version ) {
        global $wp_version, $pagenow, $action;
 
 function _redirect_to_about_wordpress( $new_version ) {
        global $wp_version, $pagenow, $action;
 

-       if ( version_compare( $wp_version, '3.3', '>=' ) )
+       if ( version_compare( $wp_version, '3.4-RC1', '>=' ) )

                return;
 
                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 ( 'update-core.php' != $pagenow )
                return;
 


@@ -624,12 +984,14 @@ function _redirect_to_about_wordpress( $new_version ) {
 
        // See do_core_upgrade()
        show_message( __('WordPress updated successfully') );
 
        // See do_core_upgrade()
        show_message( __('WordPress updated successfully') );

-       show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
-       show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
+
+       // self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.
+       show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%2$s">here</a>.' ), $new_version, 'about.php?updated' ) . '</span>' );
+       show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, 'about.php?updated' ) . '</span>' );

        echo '</div>';
        ?>
 <script type="text/javascript">
        echo '</div>';
        ?>
 <script type="text/javascript">

-window.location = '<?php echo admin_url( 'about.php?updated' ); ?>';
+window.location = 'about.php?updated';

 </script>
        <?php
 
 </script>
        <?php