X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/af50974463450c98503e763a7836a50e260461a9..3194d1bb103c2d8db4f44feeced5e58ee2756658:/wp-admin/includes/update-core.php diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 71a50da6..9f17a086 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -694,6 +694,12 @@ $_old_files = array( 'wp-includes/js/jquery/ui/jquery.ui.tabs.min.js', 'wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js', 'wp-includes/js/jquery/ui/jquery.ui.widget.min.js', +'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png', +// 4.3 +'wp-admin/js/wp-fullscreen.js', +'wp-admin/js/wp-fullscreen.min.js', +'wp-includes/js/tinymce/wp-mce-help.php', +'wp-includes/js/tinymce/plugins/wpfullscreen', ); /** @@ -709,6 +715,9 @@ $_old_files = array( * Directories should be noted by suffixing it with a trailing slash (/) * * @since 3.2.0 + * @since 4.4.0 New themes are not automatically installed on upgrade. + * This can still be explicitly asked for by defining + * CORE_UPGRADE_SKIP_NEW_BUNDLED as false. * @global array $_new_bundled_files * @var array * @name $_new_bundled_files @@ -723,8 +732,14 @@ $_new_bundled_files = array( 'themes/twentythirteen/' => '3.6', 'themes/twentyfourteen/' => '3.8', 'themes/twentyfifteen/' => '4.1', + 'themes/twentysixteen/' => '4.4', ); +// If not explicitly defined as false, don't install new default themes. +if ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || CORE_UPGRADE_SKIP_NEW_BUNDLED ) { + $_new_bundled_files = array( 'plugins/akismet/' => '2.0' ); +} + /** * Upgrade the core of WordPress. * @@ -767,8 +782,16 @@ $_new_bundled_files = array( * * @since 2.7.0 * + * @global WP_Filesystem_Base $wp_filesystem + * @global array $_old_files + * @global array $_new_bundled_files + * @global wpdb $wpdb + * @global string $wp_version + * @global string $required_php_version + * @global string $required_mysql_version + * * @param string $from New release unzipped path. - * @param string $to Path to old WordPress installation. + * @param string $to Path to old WordPress installation. * @return WP_Error|null WP_Error on failure, null on success. */ function update_core($from, $to) { @@ -809,8 +832,17 @@ function update_core($from, $to) { 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 + + /** + * Import $wp_version, $required_php_version, and $required_mysql_version from the new version + * $wp_filesystem->wp_content_dir() returned unslashed pre-2.8 + * + * @global string $wp_version + * @global string $required_php_version + * @global string $required_mysql_version + */ + global $wp_version, $required_php_version, $required_mysql_version; + $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php'; if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) { $wp_filesystem->delete( $from, true ); @@ -823,7 +855,7 @@ function update_core($from, $to) { $php_version = phpversion(); $mysql_version = $wpdb->db_version(); - $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from + $old_wp_version = $wp_version; // The version of WordPress we're updating from $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // a dash in the version indicates a Development release $php_compat = version_compare( $php_version, $required_php_version, '>=' ); if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) @@ -858,7 +890,7 @@ function update_core($from, $to) { 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 ) { + foreach ( $checksums as $file => $checksum ) { if ( 'wp-content' == substr( $file, 0, 10 ) ) continue; if ( ! file_exists( ABSPATH . $file ) ) @@ -1047,6 +1079,12 @@ function update_core($from, $to) { $wp_filesystem->delete($old_file, true); } + // Remove any Genericons example.html's from the filesystem + _upgrade_422_remove_genericons(); + + // Remove the REST API plugin if its version is Beta 4 or lower + _upgrade_440_force_deactivate_incompatible_plugins(); + // Upgrade DB with separate request /** This filter is documented in wp-admin/includes/update-core.php */ apply_filters( 'update_feedback', __( 'Upgrading database…' ) ); @@ -1095,8 +1133,10 @@ function update_core($from, $to) { * @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 + * @global WP_Filesystem_Base $wp_filesystem + * + * @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. */ @@ -1150,6 +1190,11 @@ function _copy_dir($from, $to, $skip_list = array() ) { * * @since 3.3.0 * + * @global string $wp_version + * @global string $pagenow + * @global string $action + * + * @param string $new_version */ function _redirect_to_about_wordpress( $new_version ) { global $wp_version, $pagenow, $action; @@ -1184,4 +1229,83 @@ window.location = 'about.php?updated'; include(ABSPATH . 'wp-admin/admin-footer.php'); exit(); } -add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' ); + +/** + * Cleans up Genericons example files. + * + * @since 4.2.2 + * + * @global array $wp_theme_directories + * @global WP_Filesystem_Base $wp_filesystem + */ +function _upgrade_422_remove_genericons() { + global $wp_theme_directories, $wp_filesystem; + + // A list of the affected files using the filesystem absolute paths. + $affected_files = array(); + + // Themes + foreach ( $wp_theme_directories as $directory ) { + $affected_theme_files = _upgrade_422_find_genericons_files_in_folder( $directory ); + $affected_files = array_merge( $affected_files, $affected_theme_files ); + } + + // Plugins + $affected_plugin_files = _upgrade_422_find_genericons_files_in_folder( WP_PLUGIN_DIR ); + $affected_files = array_merge( $affected_files, $affected_plugin_files ); + + foreach ( $affected_files as $file ) { + $gen_dir = $wp_filesystem->find_folder( trailingslashit( dirname( $file ) ) ); + if ( empty( $gen_dir ) ) { + continue; + } + + // The path when the file is accessed via WP_Filesystem may differ in the case of FTP + $remote_file = $gen_dir . basename( $file ); + + if ( ! $wp_filesystem->exists( $remote_file ) ) { + continue; + } + + if ( ! $wp_filesystem->delete( $remote_file, false, 'f' ) ) { + $wp_filesystem->put_contents( $remote_file, '' ); + } + } +} + +/** + * Recursively find Genericons example files in a given folder. + * + * @ignore + * @since 4.2.2 + * + * @param string $directory Directory path. Expects trailingslashed. + * @return array + */ +function _upgrade_422_find_genericons_files_in_folder( $directory ) { + $directory = trailingslashit( $directory ); + $files = array(); + + if ( file_exists( "{$directory}example.html" ) && false !== strpos( file_get_contents( "{$directory}example.html" ), 'Genericons' ) ) { + $files[] = "{$directory}example.html"; + } + + $dirs = glob( $directory . '*', GLOB_ONLYDIR ); + if ( $dirs ) { + foreach ( $dirs as $dir ) { + $files = array_merge( $files, _upgrade_422_find_genericons_files_in_folder( $dir ) ); + } + } + + return $files; +} + +/** + * @ignore + * @since 4.4.0 + */ +function _upgrade_440_force_deactivate_incompatible_plugins() { + if ( defined( 'REST_API_VERSION' ) && version_compare( REST_API_VERSION, '2.0-beta4', '<=' ) ) { + deactivate_plugins( array( 'rest-api/plugin.php' ), true ); + } +}