diff --git a/wp-admin/includes/class-wp-upgrader-skins.php b/wp-admin/includes/class-wp-upgrader-skins.php
index 0d6b2737aa..6b8fbdb735 100644
--- a/wp-admin/includes/class-wp-upgrader-skins.php
+++ b/wp-admin/includes/class-wp-upgrader-skins.php
@@ -7,942 +7,32 @@
* @since 2.8.0
*/
-/**
- * Generic Skin for the WordPress Upgrader classes. This skin is designed to be extended for specific purposes.
- *
- * @package WordPress
- * @subpackage Upgrader
- * @since 2.8.0
- */
-class WP_Upgrader_Skin {
+/** WP_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-skin.php';
- public $upgrader;
- public $done_header = false;
- public $done_footer = false;
- public $result = false;
- public $options = array();
+/** Plugin_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader-skin.php';
- /**
- *
- * @param array $args
- */
- public function __construct($args = array()) {
- $defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
- $this->options = wp_parse_args($args, $defaults);
- }
+/** Theme_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader-skin.php';
- /**
- * @param WP_Upgrader $upgrader
- */
- public function set_upgrader(&$upgrader) {
- if ( is_object($upgrader) )
- $this->upgrader =& $upgrader;
- $this->add_strings();
- }
+/** Bulk_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-bulk-upgrader-skin.php';
- /**
- * @access public
- */
- public function add_strings() {
- }
+/** Bulk_Plugin_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-bulk-plugin-upgrader-skin.php';
- /**
- *
- * @param string|false|WP_Error $result
- */
- public function set_result($result) {
- $this->result = $result;
- }
+/** Bulk_Theme_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-bulk-theme-upgrader-skin.php';
- /**
- *
- * @param bool $error
- * @param string $context
- * @param bool $allow_relaxed_file_ownership
- * @return type
- */
- public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) {
- $url = $this->options['url'];
- if ( ! $context ) {
- $context = $this->options['context'];
- }
- if ( !empty($this->options['nonce']) ) {
- $url = wp_nonce_url($url, $this->options['nonce']);
- }
+/** Plugin_Installer_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-plugin-installer-skin.php';
- $extra_fields = array();
+/** Theme_Installer_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-theme-installer-skin.php';
- return request_filesystem_credentials( $url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership );
- }
+/** Language_Pack_Upgrader_Skin class */
+require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader-skin.php';
- /**
- * @access public
- */
- public function header() {
- if ( $this->done_header ) {
- return;
- }
- $this->done_header = true;
- echo '';
- echo '
' . $this->options['title'] . '
';
- }
-
- /**
- * @access public
- */
- public function footer() {
- if ( $this->done_footer ) {
- return;
- }
- $this->done_footer = true;
- echo '';
- }
-
- /**
- *
- * @param string|WP_Error $errors
- */
- public function error($errors) {
- if ( ! $this->done_header )
- $this->header();
- if ( is_string($errors) ) {
- $this->feedback($errors);
- } elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
- foreach ( $errors->get_error_messages() as $message ) {
- if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
- $this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
- else
- $this->feedback($message);
- }
- }
- }
-
- /**
- *
- * @param string $string
- */
- public function feedback($string) {
- if ( isset( $this->upgrader->strings[$string] ) )
- $string = $this->upgrader->strings[$string];
-
- if ( strpos($string, '%') !== false ) {
- $args = func_get_args();
- $args = array_splice($args, 1);
- if ( $args ) {
- $args = array_map( 'strip_tags', $args );
- $args = array_map( 'esc_html', $args );
- $string = vsprintf($string, $args);
- }
- }
- if ( empty($string) )
- return;
- show_message($string);
- }
-
- /**
- * @access public
- */
- public function before() {}
-
- /**
- * @access public
- */
- public function after() {}
-
- /**
- * Output JavaScript that calls function to decrement the update counts.
- *
- * @since 3.9.0
- *
- * @param string $type Type of update count to decrement. Likely values include 'plugin',
- * 'theme', 'translation', etc.
- */
- protected function decrement_update_count( $type ) {
- if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
- return;
- }
-
- if ( defined( 'IFRAME_REQUEST' ) ) {
- echo '';
- } else {
- echo '';
- }
- }
-
- /**
- * @access public
- */
- public function bulk_header() {}
-
- /**
- * @access public
- */
- public function bulk_footer() {}
-}
-
-/**
- * Plugin Upgrader Skin for WordPress Plugin Upgrades.
- *
- * @package WordPress
- * @subpackage Upgrader
- * @since 2.8.0
- */
-class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
- public $plugin = '';
- public $plugin_active = false;
- public $plugin_network_active = false;
-
- /**
- *
- * @param array $args
- */
- public function __construct( $args = array() ) {
- $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
- $args = wp_parse_args($args, $defaults);
-
- $this->plugin = $args['plugin'];
-
- $this->plugin_active = is_plugin_active( $this->plugin );
- $this->plugin_network_active = is_plugin_active_for_network( $this->plugin );
-
- parent::__construct($args);
- }
-
- /**
- * @access public
- */
- public function after() {
- $this->plugin = $this->upgrader->plugin_info();
- if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
- // Currently used only when JS is off for a single plugin update?
- echo '';
- }
-
- $this->decrement_update_count( 'plugin' );
-
- $update_actions = array(
- 'activate_plugin' => '' . __( 'Activate Plugin' ) . '',
- 'plugins_page' => '' . __( 'Return to Plugins page' ) . ''
- );
- if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
- unset( $update_actions['activate_plugin'] );
-
- /**
- * Filter the list of action links available following a single plugin update.
- *
- * @since 2.7.0
- *
- * @param array $update_actions Array of plugin action links.
- * @param string $plugin Path to the plugin file.
- */
- $update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
-
- if ( ! empty($update_actions) )
- $this->feedback(implode(' | ', (array)$update_actions));
- }
-}
-
-/**
- * Plugin Upgrader Skin for WordPress Plugin Upgrades.
- *
- * @package WordPress
- * @subpackage Upgrader
- * @since 3.0.0
- */
-class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
- public $in_loop = false;
- /**
- * @var string|false
- */
- public $error = false;
-
- /**
- *
- * @param array $args
- */
- public function __construct($args = array()) {
- $defaults = array( 'url' => '', 'nonce' => '' );
- $args = wp_parse_args($args, $defaults);
-
- parent::__construct($args);
- }
-
- /**
- * @access public
- */
- public function add_strings() {
- $this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
- /* translators: 1: Title of an update, 2: Error message */
- $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: %2$s');
- /* translators: 1: Title of an update */
- $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
- /* translators: 1: Title of an update */
- $this->upgrader->strings['skin_update_successful'] = __( '%1$s updated successfully.' ) . ' ' . __( 'Show Details' ) . '' . __( 'Hide Details' ) . '';
- $this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
- }
-
- /**
- * @param string $string
- */
- public function feedback($string) {
- if ( isset( $this->upgrader->strings[$string] ) )
- $string = $this->upgrader->strings[$string];
-
- if ( strpos($string, '%') !== false ) {
- $args = func_get_args();
- $args = array_splice($args, 1);
- if ( $args ) {
- $args = array_map( 'strip_tags', $args );
- $args = array_map( 'esc_html', $args );
- $string = vsprintf($string, $args);
- }
- }
- if ( empty($string) )
- return;
- if ( $this->in_loop )
- echo "$string
\n";
- else
- echo "$string
\n";
- }
-
- /**
- * @access public
- */
- public function header() {
- // Nothing, This will be displayed within a iframe.
- }
-
- /**
- * @access public
- */
- public function footer() {
- // Nothing, This will be displayed within a iframe.
- }
-
- /**
- *
- * @param string|WP_Error $error
- */
- public function error($error) {
- if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
- $this->error = $this->upgrader->strings[$error];
-
- if ( is_wp_error($error) ) {
- $messages = array();
- foreach ( $error->get_error_messages() as $emessage ) {
- if ( $error->get_error_data() && is_string( $error->get_error_data() ) )
- $messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
- else
- $messages[] = $emessage;
- }
- $this->error = implode(', ', $messages);
- }
- echo '';
- }
-
- /**
- * @access public
- */
- public function bulk_header() {
- $this->feedback('skin_upgrade_start');
- }
-
- /**
- * @access public
- */
- public function bulk_footer() {
- $this->feedback('skin_upgrade_end');
- }
-
- /**
- *
- * @param string $title
- */
- public function before($title = '') {
- $this->in_loop = true;
- printf( '' . $this->upgrader->strings['skin_before_update_header'] . '
', $title, $this->upgrader->update_current, $this->upgrader->update_count );
- echo '';
- echo '';
- $this->flush_output();
- }
-
- /**
- *
- * @param string $title
- */
- public function after($title = '') {
- echo '
' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, '' . $this->error . '' ) . '
' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '
' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '
';
-
- printf( '
' . __( 'Updating translations for %1$s (%2$s)…' ) . '
', $name, $this->language_update->language );
- }
-
- /**
- *
- * @param string|WP_Error $error
- */
- public function error( $error ) {
- echo '
';
- parent::error( $error );
- echo '
';
- }
-
- /**
- * @access public
- */
- public function after() {
- echo '