X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..a6f44f0edcda2471c5a33e4156c1c9488c7f3210:/wp-admin/includes/update-core.php diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index bf9ef276..ea1312b1 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -395,6 +395,169 @@ $_old_files = array( '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', ); /** @@ -417,9 +580,11 @@ $_old_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', ); /** @@ -473,11 +638,37 @@ function update_core($from, $to) { @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', __('Could not copy file.') ); + } + + $wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE ); + require_once( WP_CONTENT_DIR . '/upgrade/version-current.php' ); + $wp_filesystem->delete( $versions_file ); + $php_version = phpversion(); $mysql_version = $wpdb->db_version(); - $required_php_version = '5.2.4'; - $required_mysql_version = '5.0'; - $wp_version = '3.4'; + $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; @@ -494,21 +685,6 @@ 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…')); - $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') ); - } - apply_filters('update_feedback', __('Installing the latest version…')); // Create maintenance file to signal that we are upgrading @@ -540,16 +716,27 @@ function update_core($from, $to) { } } + // 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve. + if ( '3.5' == $old_wp_version ) { + if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' ) ) { + $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 ) ) { - $old_version = $GLOBALS['wp_version']; // $wp_version in local scope == new 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); + // 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 ) @@ -558,13 +745,13 @@ function update_core($from, $to) { 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) ) $result = new WP_Error('copy_failed', __('Could not copy file.'), $dest . $filename); } 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); @@ -695,12 +882,14 @@ function _redirect_to_about_wordpress( $new_version ) { // See do_core_upgrade() show_message( __('WordPress updated successfully') ); - show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '' ); - show_message( '' . sprintf( __( 'Welcome to WordPress %1$s. Learn more.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '' ); + + // 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 ''; ?>