WordPress 4.3

[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 5a97b183423d8f5f39b066cc3e082d868cf86c7b..04aa988a432ceaae51e5b39d1cb2c86b28927b6b 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/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',

 );
 
 /**
 );
 
 /**


@@ -768,8 +773,16 @@ $_new_bundled_files = array(
  *
  * @since 2.7.0
  *
  *
  * @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 $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) {
  * @return WP_Error|null WP_Error on failure, null on success.
  */
 function update_core($from, $to) {


@@ -810,8 +823,15 @@ function update_core($from, $to) {
                return new WP_Error( 'insane_distro', __('The update could not be unpacked') );
        }
 
                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';
        global $wp_version, $required_php_version, $required_mysql_version;
 
        $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';


@@ -1050,6 +1070,9 @@ function update_core($from, $to) {
                $wp_filesystem->delete($old_file, true);
        }
 
                $wp_filesystem->delete($old_file, true);
        }
 

+       // Remove any Genericons example.html's from the filesystem
+       _upgrade_422_remove_genericons();
+

        // Upgrade DB with separate request
        /** This filter is documented in wp-admin/includes/update-core.php */
        apply_filters( 'update_feedback', __( 'Upgrading database…' ) );
        // Upgrade DB with separate request
        /** This filter is documented in wp-admin/includes/update-core.php */
        apply_filters( 'update_feedback', __( 'Upgrading database…' ) );


@@ -1098,8 +1121,10 @@ function update_core($from, $to) {
  * @since 3.7.0 Updated not to use a regular expression for the skip list
  * @see copy_dir()
  *
  * @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.
  */
  * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */


@@ -1153,6 +1178,11 @@ function _copy_dir($from, $to, $skip_list = array() ) {
  *
  * @since 3.3.0
  *
  *
  * @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;
  */
 function _redirect_to_about_wordpress( $new_version ) {
        global $wp_version, $pagenow, $action;


@@ -1187,4 +1217,73 @@ window.location = 'about.php?updated';
        include(ABSPATH . 'wp-admin/admin-footer.php');
        exit();
 }
        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" ), '<title>Genericons</title>' ) ) {
+               $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;
+}