X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f:/wp-admin/includes/update-core.php?ds=sidebyside diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 167b5bc1..8c947968 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -18,13 +18,74 @@ 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-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', @@ -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/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/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-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/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', @@ -101,77 +132,561 @@ $_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/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', +// 2.5.1 '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-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/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/streams.php' +'wp-includes/js/tinymce/plugins/wordpress/js', +'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-options.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', +// 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/import', +'wp-admin/js/wp-gears.dev.js', +'wp-admin/js/wp-gears.js', +'wp-admin/options-misc.php', +'wp-admin/page-new.php', +'wp-admin/page.php', +'wp-admin/rtl.css', +'wp-admin/rtl.dev.css', +'wp-admin/update-links.php', +'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.js', +'wp-includes/js/jquery/interface.js', +'wp-includes/js/scriptaculous/prototype.js', +'wp-includes/js/tinymce/wp-tinymce.js', +// 3.1 +'wp-admin/edit-attachment-rows.php', +'wp-admin/edit-link-categories.php', +'wp-admin/edit-link-category-form.php', +'wp-admin/edit-post-rows.php', +'wp-admin/images/button-grad-active-vs.png', +'wp-admin/images/button-grad-vs.png', +'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/list-vs.png', +'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/link-category.php', +'wp-admin/sidebar.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 +'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/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/themes/advanced/img/fm.gif', +'wp-includes/js/tinymce/themes/advanced/img/sflogo.png', +// 3.3 +'wp-admin/css/colors-classic-rtl.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.dev.css', +'wp-admin/css/dashboard.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.dev.css', +'wp-admin/css/login-rtl.dev.css', +'wp-admin/css/login.dev.css', +'wp-admin/css/ms.css', +'wp-admin/css/ms.dev.css', +'wp-admin/css/nav-menu-rtl.css', +'wp-admin/css/nav-menu-rtl.dev.css', +'wp-admin/css/nav-menu.css', +'wp-admin/css/nav-menu.dev.css', +'wp-admin/css/plugin-install-rtl.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.dev.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/theme-editor.css', +'wp-admin/css/theme-editor.dev.css', +'wp-admin/css/theme-install-rtl.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.dev.css', +'wp-admin/css/widgets.dev.css', +'wp-admin/includes/internal-linking.php', +'wp-includes/images/admin-bar-sprite-rtl.png', +'wp-includes/js/jquery/ui.button.js', +'wp-includes/js/jquery/ui.core.js', +'wp-includes/js/jquery/ui.dialog.js', +'wp-includes/js/jquery/ui.draggable.js', +'wp-includes/js/jquery/ui.droppable.js', +'wp-includes/js/jquery/ui.mouse.js', +'wp-includes/js/jquery/ui.position.js', +'wp-includes/js/jquery/ui.resizable.js', +'wp-includes/js/jquery/ui.selectable.js', +'wp-includes/js/jquery/ui.sortable.js', +'wp-includes/js/jquery/ui.tabs.js', +'wp-includes/js/jquery/ui.widget.js', +'wp-includes/js/l10n.dev.js', +'wp-includes/js/l10n.js', +'wp-includes/js/tinymce/plugins/wplink/css', +'wp-includes/js/tinymce/plugins/wplink/img', +'wp-includes/js/tinymce/plugins/wplink/js', +'wp-includes/js/tinymce/themes/advanced/img/wpicons.png', +'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png', +'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.png', +'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', +// 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', +); + +/** + * Stores new files in wp-content to copy + * + * The contents of this array indicate any new bundled plugins/themes which + * should be installed with the WordPress Upgrade. These items will not be + * re-installed in future upgrades, this behaviour is controlled by the + * 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 + * Directories should be noted by suffixing it with a trailing slash (/) + * + * @since 3.2.0 + * @global array $_new_bundled_files + * @var array + * @name $_new_bundled_files + */ +global $_new_bundled_files; + +$_new_bundled_files = array( + 'plugins/akismet/' => '2.0', + 'themes/twentyten/' => '3.0', + 'themes/twentyeleven/' => '3.2', + 'themes/twentytwelve/' => '3.5', + 'themes/twentythirteen/' => '3.6', + 'themes/twentyfourteen/' => '3.8', ); /** @@ -184,12 +699,18 @@ $_old_files = array( * The files in the {@link $_old_files} list will be removed and the new files * copied from the zip file after the database is upgraded. * + * The files in the {@link $_new_bundled_files} list will be added to the installation + * if the version is greater than or equal to the old version being upgraded. + * * The steps for the upgrader for after the new release is downloaded and * unzipped is: * 1. Test unzipped location for select files to ensure that unzipped worked. * 2. Create the .maintenance file in current WordPress base. * 3. Copy new WordPress directory over old WordPress files. * 4. Upgrade WordPress to new version. + * 4.1. Copy all files/folders other than wp-content + * 4.2. Copy any language files to WP_LANG_DIR (which may differ from WP_CONTENT_DIR + * 4.3. Copy any new bundled themes/plugins to their respective locations * 5. Delete new WordPress directory path. * 6. Delete .maintenance file. * 7. Remove old files. @@ -215,17 +736,67 @@ $_old_files = array( * @return WP_Error|null WP_Error on failure, null on success. */ function update_core($from, $to) { - global $wp_filesystem, $_old_files, $wpdb; + global $wp_filesystem, $_old_files, $_new_bundled_files, $wpdb; @set_time_limit( 300 ); + /** + * 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 ) { + 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(); - $required_php_version = '4.3'; - $required_mysql_version = '4.1.2'; - $wp_version = '2.9'; + $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, '>=' ); - $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); + if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) + $mysql_compat = true; + else + $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ); + + if ( !$mysql_compat || !$php_compat ) + $wp_filesystem->delete($from, true); if ( !$mysql_compat && !$php_compat ) return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) ); @@ -234,26 +805,200 @@ 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 ) ); - // Sanity check the unzipped distribution - apply_filters('update_feedback', __('Verifying the unpacked files')); - if ( !$wp_filesystem->exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') || - !$wp_filesystem->exists($from . '/wordpress/wp-includes/functions.php') ) { - $wp_filesystem->delete($from, true); - return new WP_Error('insane_distro', __('The update could not be unpacked') ); + /** 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; + } + } } - 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 ) ); + } + } + /** 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 = ''; $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…' ) ); // Copy new versions of WP files into place. - $result = copy_dir($from . '/wordpress', $to); + $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 + if ( !is_wp_error($result) && $wp_filesystem->is_dir($from . $distro . 'wp-content/languages') ) { + if ( WP_LANG_DIR != ABSPATH . WPINC . '/languages' || @is_dir(WP_LANG_DIR) ) + $lang_dir = WP_LANG_DIR; + else + $lang_dir = WP_CONTENT_DIR . '/languages'; + + if ( !@is_dir($lang_dir) && 0 === strpos($lang_dir, ABSPATH) ) { // Check the language directory exists first + $wp_filesystem->mkdir($to . str_replace(ABSPATH, '', $lang_dir), FS_CHMOD_DIR); // If it's within the ABSPATH we can handle it here, otherwise they're out of luck. + clearstatcache(); // for FTP, Need to clear the stat cache + } + + if ( @is_dir($lang_dir) ) { + $wp_lang_dir = $wp_filesystem->find_folder($lang_dir); + if ( $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…' ) ); + // 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. + // $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 ) ) { + foreach ( (array) $_new_bundled_files as $file => $introduced_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); + + // 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 ) + $dest = trailingslashit($wp_filesystem->wp_themes_dir()); // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2 + else + continue; + + if ( ! $directory ) { + if ( ! $development_build && $wp_filesystem->exists( $dest . $filename ) ) + continue; + + if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) ) + $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); + + // 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 + } + + // Handle $result error from the above blocks if ( is_wp_error($result) ) { - $wp_filesystem->delete($maintenance_file); $wp_filesystem->delete($from, true); return $result; } @@ -267,21 +1012,140 @@ function update_core($from, $to) { } // Upgrade DB with separate request - apply_filters('update_feedback', __('Upgrading database')); + /** This filter is documented in wp-admin/includes/update-core.php */ + apply_filters( 'update_feedback', __( 'Upgrading database…' ) ); $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); // Force refresh of update information - if ( function_exists('delete_transient') ) - delete_transient('update_core'); + if ( function_exists('delete_site_transient') ) + delete_site_transient('update_core'); else delete_option('update_core'); - // Remove maintenance file, we're done. - $wp_filesystem->delete($maintenance_file); + /** + * 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 ); + + // 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; +} + +/** + * 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, as well as for those upgrading to + * 3.7+ + * + * @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 + * @param string $to destination directory + * @param array $skip_list a list of files/folders to skip copying + * @return mixed WP_Error on failure, True on success. + */ +function _copy_dir($from, $to, $skip_list = array() ) { + global $wp_filesystem; + + $dirlist = $wp_filesystem->dirlist($from); + + $from = trailingslashit($from); + $to = trailingslashit($to); + + foreach ( (array) $dirlist as $filename => $fileinfo ) { + 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. + $wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE ); + if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) + 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) ) + return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename ); + } + + /* + * 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; + } + } + return true; } -?> +/** + * Redirect to the About WordPress page after a successful upgrade. + * + * This function is only needed when the existing install is older than 3.4.0. + * + * @since 3.3.0 + * + */ +function _redirect_to_about_wordpress( $new_version ) { + global $wp_version, $pagenow, $action; + + if ( version_compare( $wp_version, '3.4-RC1', '>=' ) ) + return; + + // 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; + + // Load the updated default text localization domain for new strings. + load_default_textdomain(); + + // See do_core_upgrade() + show_message( __('WordPress updated successfully') ); + + // self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional. + show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here.' ), $new_version, 'about.php?updated' ) . '' ); + show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. Learn more.' ), $new_version, 'about.php?updated' ) . '' ); + echo ''; + ?> + +