WordPress 4.4.1-scripts

[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 04cd780b21c161626c2bd9dfb07f4c0b5811b56a..9f17a086d9e7f2a3ad6cc76fb40bd17d37eb36ab 100644 (file)
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -694,7 +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'
+'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',
 );
 
 /**
@@ -710,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
@@ -724,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.
  *
@@ -768,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) {
@@ -810,8 +832,15 @@ 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';
@@ -861,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 ) )
@@ -1053,6 +1082,9 @@ function update_core($from, $to) {
        // 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…' ) );
@@ -1101,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.
  */
@@ -1156,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;
@@ -1190,12 +1229,14 @@ 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;
@@ -1258,3 +1299,13 @@ function _upgrade_422_find_genericons_files_in_folder( $directory ) {
 
        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 );
+       }
+}