X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/b609ea801799cbbd5f02d95e0dc547ab53a56f4c..61343b82c4f0da4c68e4c6373daafff4a81efdd1:/wp-admin/includes/class-wp-upgrader.php?ds=sidebyside
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index d81b3056..6c399c7e 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -25,9 +25,6 @@ class WP_Upgrader {
var $skin = null;
var $result = array();
- function WP_Upgrader($skin = null) {
- return $this->__construct($skin);
- }
function __construct($skin = null) {
if ( null == $skin )
$this->skin = new WP_Upgrader_Skin();
@@ -53,9 +50,10 @@ class WP_Upgrader {
$this->strings['download_failed'] = __('Download failed.');
$this->strings['installing_package'] = __('Installing the latest version…');
+ $this->strings['no_files'] = __('The package contains no files.');
$this->strings['folder_exists'] = __('Destination folder already exists.');
$this->strings['mkdir_failed'] = __('Could not create directory.');
- $this->strings['bad_package'] = __('Incompatible Archive.');
+ $this->strings['incompatible_archive'] = __('The package could not be installed.');
$this->strings['maintenance_start'] = __('Enabling Maintenance mode…');
$this->strings['maintenance_end'] = __('Disabling Maintenance mode…');
@@ -101,7 +99,7 @@ class WP_Upgrader {
break;
default:
if ( ! $wp_filesystem->find_folder($dir) )
- return new WP_Error('fs_no_folder', sprintf($this->strings['fs_no_folder'], $dir));
+ return new WP_Error( 'fs_no_folder', sprintf( $this->strings['fs_no_folder'], esc_html( basename( $dir ) ) ) );
break;
}
}
@@ -156,6 +154,9 @@ class WP_Upgrader {
if ( is_wp_error($result) ) {
$wp_filesystem->delete($working_dir, true);
+ if ( 'incompatible_archive' == $result->get_error_code() ) {
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], $result->get_error_data() );
+ }
return $result;
}
@@ -166,6 +167,7 @@ class WP_Upgrader {
global $wp_filesystem;
$defaults = array( 'source' => '', 'destination' => '', //Please always pass these
'clear_destination' => false, 'clear_working' => false,
+ 'abort_if_destination_exists' => true,
'hook_extra' => array());
$args = wp_parse_args($args, $defaults);
@@ -193,8 +195,9 @@ class WP_Upgrader {
if ( 1 == count($source_files) && $wp_filesystem->is_dir( trailingslashit($source) . $source_files[0] . '/') ) //Only one folder? Then we want its contents.
$source = trailingslashit($source) . trailingslashit($source_files[0]);
elseif ( count($source_files) == 0 )
- return new WP_Error('bad_package', $this->strings['bad_package']); //There are no files?
- //else //Its only a single file, The upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], $this->strings['no_files'] ); //There are no files?
+ else //It's only a single file, the upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
+ $source = trailingslashit($source);
//Hook ability to change the source file location..
$source = apply_filters('upgrader_source_selection', $source, $remote_source, $this);
@@ -211,25 +214,25 @@ class WP_Upgrader {
$destination = trailingslashit($destination) . trailingslashit(basename($source));
}
- if ( $wp_filesystem->exists($remote_destination) ) {
- if ( $clear_destination ) {
- //We're going to clear the destination if theres something there
- $this->skin->feedback('remove_old');
+ if ( $clear_destination ) {
+ //We're going to clear the destination if there's something there
+ $this->skin->feedback('remove_old');
+ $removed = true;
+ if ( $wp_filesystem->exists($remote_destination) )
$removed = $wp_filesystem->delete($remote_destination, true);
- $removed = apply_filters('upgrader_clear_destination', $removed, $local_destination, $remote_destination, $hook_extra);
-
- if ( is_wp_error($removed) )
- return $removed;
- else if ( ! $removed )
- return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
- } else {
- //If we're not clearing the destination folder and something exists there allready, Bail.
- //But first check to see if there are actually any files in the folder.
- $_files = $wp_filesystem->dirlist($remote_destination);
- if ( ! empty($_files) ) {
- $wp_filesystem->delete($remote_source, true); //Clear out the source files.
- return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
- }
+ $removed = apply_filters('upgrader_clear_destination', $removed, $local_destination, $remote_destination, $hook_extra);
+
+ if ( is_wp_error($removed) )
+ return $removed;
+ else if ( ! $removed )
+ return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+ } elseif ( $abort_if_destination_exists && $wp_filesystem->exists($remote_destination) ) {
+ //If we're not clearing the destination folder and something exists there already, Bail.
+ //But first check to see if there are actually any files in the folder.
+ $_files = $wp_filesystem->dirlist($remote_destination);
+ if ( ! empty($_files) ) {
+ $wp_filesystem->delete($remote_source, true); //Clear out the source files.
+ return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
}
}
@@ -271,6 +274,7 @@ class WP_Upgrader {
$defaults = array( 'package' => '', //Please always pass this.
'destination' => '', //And this
'clear_destination' => false,
+ 'abort_if_destination_exists' => true, // Abort if the Destination directory exists, Pass clear_destination as false please
'clear_working' => true,
'is_multi' => false,
'hook_extra' => array() //Pass any extra $hook_extra args here, this will be passed to any hooked filters.
@@ -302,8 +306,10 @@ class WP_Upgrader {
return $download;
}
- //Unzip's the file into a temporary directory
- $working_dir = $this->unpack_package( $download );
+ $delete_package = ($download != $package); // Do not delete a "local" file
+
+ //Unzips the file into a temporary directory
+ $working_dir = $this->unpack_package( $download, $delete_package );
if ( is_wp_error($working_dir) ) {
$this->skin->error($working_dir);
$this->skin->after();
@@ -315,6 +321,7 @@ class WP_Upgrader {
'source' => $working_dir,
'destination' => $destination,
'clear_destination' => $clear_destination,
+ 'abort_if_destination_exists' => $abort_if_destination_exists,
'clear_working' => $clear_working,
'hook_extra' => $hook_extra
) );
@@ -323,7 +330,7 @@ class WP_Upgrader {
$this->skin->error($result);
$this->skin->feedback('process_failed');
} else {
- //Install Suceeded
+ //Install Succeeded
$this->skin->feedback('process_success');
}
$this->skin->after();
@@ -371,7 +378,6 @@ class Plugin_Upgrader extends WP_Upgrader {
$this->strings['no_package'] = __('Update package not available.');
$this->strings['downloading_package'] = __('Downloading update from %s…');
$this->strings['unpack_package'] = __('Unpacking the update…');
- $this->strings['deactivate_plugin'] = __('Deactivating the plugin…');
$this->strings['remove_old'] = __('Removing the old version of the plugin…');
$this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
$this->strings['process_failed'] = __('Plugin update failed.');
@@ -383,6 +389,7 @@ class Plugin_Upgrader extends WP_Upgrader {
$this->strings['downloading_package'] = __('Downloading install package from %s…');
$this->strings['unpack_package'] = __('Unpacking the package…');
$this->strings['installing_package'] = __('Installing the plugin…');
+ $this->strings['no_files'] = __('The plugin contains no files.');
$this->strings['process_failed'] = __('Plugin install failed.');
$this->strings['process_success'] = __('Plugin installed successfully.');
}
@@ -392,6 +399,8 @@ class Plugin_Upgrader extends WP_Upgrader {
$this->init();
$this->install_strings();
+ add_filter('upgrader_source_selection', array(&$this, 'check_package') );
+
$this->run(array(
'package' => $package,
'destination' => WP_PLUGIN_DIR,
@@ -400,9 +409,17 @@ class Plugin_Upgrader extends WP_Upgrader {
'hook_extra' => array()
));
+ remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
+
+ if ( ! $this->result || is_wp_error($this->result) )
+ return $this->result;
+
// Force refresh of plugin update information
delete_site_transient('update_plugins');
+ wp_cache_delete( 'plugins', 'plugins' );
+ do_action( 'upgrader_process_complete', $this, array( 'action' => 'install', 'type' => 'plugin' ), $package );
+ return true;
}
function upgrade($plugin) {
@@ -424,7 +441,7 @@ class Plugin_Upgrader extends WP_Upgrader {
add_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'), 10, 2);
add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
- //'source_selection' => array(&$this, 'source_selection'), //theres a track ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
+ //'source_selection' => array(&$this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
$this->run(array(
'package' => $r->package,
@@ -436,7 +453,7 @@ class Plugin_Upgrader extends WP_Upgrader {
)
));
- // Cleanup our hooks, incase something else does a upgrade on this connection.
+ // Cleanup our hooks, in case something else does a upgrade on this connection.
remove_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'));
remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
@@ -445,6 +462,8 @@ class Plugin_Upgrader extends WP_Upgrader {
// Force refresh of plugin update information
delete_site_transient('update_plugins');
+ wp_cache_delete( 'plugins', 'plugins' );
+ do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'plugin' ), $plugin );
}
function bulk_upgrade($plugins) {
@@ -484,11 +503,11 @@ class Plugin_Upgrader extends WP_Upgrader {
$this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true);
if ( !isset( $current->response[ $plugin ] ) ) {
- $this->skin->set_result(false);
+ $this->skin->set_result(true);
$this->skin->before();
- $this->skin->error('up_to_date');
+ $this->skin->feedback('up_to_date');
$this->skin->after();
- $results[$plugin] = false;
+ $results[$plugin] = true;
continue;
}
@@ -521,15 +540,43 @@ class Plugin_Upgrader extends WP_Upgrader {
$this->skin->footer();
- // Cleanup our hooks, incase something else does a upgrade on this connection.
+ // Cleanup our hooks, in case something else does a upgrade on this connection.
remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
// Force refresh of plugin update information
delete_site_transient('update_plugins');
+ wp_cache_delete( 'plugins', 'plugins' );
+ do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'plugin', 'bulk' => true ), $plugins );
return $results;
}
+ function check_package($source) {
+ global $wp_filesystem;
+
+ if ( is_wp_error($source) )
+ return $source;
+
+ $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
+ if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
+ return $source;
+
+ // Check the folder contains at least 1 valid plugin.
+ $plugins_found = false;
+ foreach ( glob( $working_directory . '*.php' ) as $file ) {
+ $info = get_plugin_data($file, false, false);
+ if ( !empty( $info['Name'] ) ) {
+ $plugins_found = true;
+ break;
+ }
+ }
+
+ if ( ! $plugins_found )
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('No valid plugins were found.') );
+
+ return $source;
+ }
+
//return plugin info.
function plugin_info() {
if ( ! is_array($this->result) )
@@ -557,7 +604,6 @@ class Plugin_Upgrader extends WP_Upgrader {
return new WP_Error('bad_request', $this->strings['bad_request']);
if ( is_plugin_active($plugin) ) {
- $this->skin->feedback('deactivate_plugin');
//Deactivate the plugin silently, Prevent deactivation hooks from running.
deactivate_plugins($plugin, true);
}
@@ -577,11 +623,11 @@ class Plugin_Upgrader extends WP_Upgrader {
$plugins_dir = $wp_filesystem->wp_plugins_dir();
$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
- if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If its already vanished.
+ if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished.
return $removed;
// If plugin is in its own directory, recursively delete the directory.
- if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
+ if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder
$deleted = $wp_filesystem->delete($this_plugin_dir, true);
else
$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
@@ -589,7 +635,7 @@ class Plugin_Upgrader extends WP_Upgrader {
if ( ! $deleted )
return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
- return $removed;
+ return true;
}
}
@@ -605,6 +651,7 @@ class Plugin_Upgrader extends WP_Upgrader {
class Theme_Upgrader extends WP_Upgrader {
var $result;
+ var $bulk = false;
function upgrade_strings() {
$this->strings['up_to_date'] = __('The theme is at the latest version.');
@@ -622,8 +669,83 @@ class Theme_Upgrader extends WP_Upgrader {
$this->strings['downloading_package'] = __('Downloading install package from %s…');
$this->strings['unpack_package'] = __('Unpacking the package…');
$this->strings['installing_package'] = __('Installing the theme…');
+ $this->strings['no_files'] = __('The theme contains no files.');
$this->strings['process_failed'] = __('Theme install failed.');
$this->strings['process_success'] = __('Theme installed successfully.');
+ /* translators: 1: theme name, 2: version */
+ $this->strings['process_success_specific'] = __('Successfully installed the theme %1$s %2$s.');
+ $this->strings['parent_theme_search'] = __('This theme requires a parent theme. Checking if it is installed…');
+ /* translators: 1: theme name, 2: version */
+ $this->strings['parent_theme_prepare_install'] = __('Preparing to install %1$s %2$s…');
+ /* translators: 1: theme name, 2: version */
+ $this->strings['parent_theme_currently_installed'] = __('The parent theme, %1$s %2$s, is currently installed.');
+ /* translators: 1: theme name, 2: version */
+ $this->strings['parent_theme_install_success'] = __('Successfully installed the parent theme, %1$s %2$s.');
+ $this->strings['parent_theme_not_found'] = __('The parent theme could not be found. You will need to install the parent theme, %s, before you can use this child theme.');
+ }
+
+ function check_parent_theme_filter($install_result, $hook_extra, $child_result) {
+ // Check to see if we need to install a parent theme
+ $theme_info = $this->theme_info();
+
+ if ( ! $theme_info->parent() )
+ return $install_result;
+
+ $this->skin->feedback( 'parent_theme_search' );
+
+ if ( ! $theme_info->parent()->errors() ) {
+ $this->skin->feedback( 'parent_theme_currently_installed', $theme_info->parent()->display('Name'), $theme_info->parent()->display('Version') );
+ // We already have the theme, fall through.
+ return $install_result;
+ }
+
+ // We don't have the parent theme, lets install it
+ $api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
+
+ if ( ! $api || is_wp_error($api) ) {
+ $this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
+ // Don't show activate or preview actions after install
+ add_filter('install_theme_complete_actions', array(&$this, 'hide_activate_preview_actions') );
+ return $install_result;
+ }
+
+ // Backup required data we're going to override:
+ $child_api = $this->skin->api;
+ $child_success_message = $this->strings['process_success'];
+
+ // Override them
+ $this->skin->api = $api;
+ $this->strings['process_success_specific'] = $this->strings['parent_theme_install_success'];//, $api->name, $api->version);
+
+ $this->skin->feedback('parent_theme_prepare_install', $api->name, $api->version);
+
+ add_filter('install_theme_complete_actions', '__return_false', 999); // Don't show any actions after installing the theme.
+
+ // Install the parent theme
+ $parent_result = $this->run( array(
+ 'package' => $api->download_link,
+ 'destination' => WP_CONTENT_DIR . '/themes',
+ 'clear_destination' => false, //Do not overwrite files.
+ 'clear_working' => true
+ ) );
+
+ if ( is_wp_error($parent_result) )
+ add_filter('install_theme_complete_actions', array(&$this, 'hide_activate_preview_actions') );
+
+ // Start cleaning up after the parents installation
+ remove_filter('install_theme_complete_actions', '__return_false', 999);
+
+ // Reset child's result and data
+ $this->result = $child_result;
+ $this->skin->api = $child_api;
+ $this->strings['process_success'] = $child_success_message;
+
+ return $install_result;
+ }
+
+ function hide_activate_preview_actions($actions) {
+ unset($actions['activate'], $actions['preview']);
+ return $actions;
}
function install($package) {
@@ -631,6 +753,9 @@ class Theme_Upgrader extends WP_Upgrader {
$this->init();
$this->install_strings();
+ add_filter('upgrader_source_selection', array(&$this, 'check_package') );
+ add_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'), 10, 3);
+
$options = array(
'package' => $package,
'destination' => WP_CONTENT_DIR . '/themes',
@@ -640,16 +765,17 @@ class Theme_Upgrader extends WP_Upgrader {
$this->run($options);
+ remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
+ remove_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'));
+
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
// Force refresh of theme update information
- delete_site_transient('update_themes');
+ wp_clean_themes_cache();
+ do_action( 'upgrader_process_complete', $this, array( 'action' => 'install', 'type' => 'theme' ), $package );
- if ( empty($result['destination_name']) )
- return false;
- else
- return $result['destination_name'];
+ return true;
}
function upgrade($theme) {
@@ -685,11 +811,16 @@ class Theme_Upgrader extends WP_Upgrader {
$this->run($options);
+ remove_filter('upgrader_pre_install', array(&$this, 'current_before'));
+ remove_filter('upgrader_post_install', array(&$this, 'current_after'));
+ remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'));
+
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
// Force refresh of theme update information
- delete_site_transient('update_themes');
+ wp_clean_themes_cache();
+ do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'theme' ), $theme );
return true;
}
@@ -731,17 +862,17 @@ class Theme_Upgrader extends WP_Upgrader {
foreach ( $themes as $theme ) {
$this->update_current++;
+ $this->skin->theme_info = $this->theme_info($theme);
+
if ( !isset( $current->response[ $theme ] ) ) {
- $this->skin->set_result(false);
+ $this->skin->set_result(true);
$this->skin->before();
- $this->skin->error('up_to_date');
+ $this->skin->feedback('up_to_date');
$this->skin->after();
- $results[$theme] = false;
+ $results[$theme] = true;
continue;
}
- $this->skin->theme_info = $this->theme_info($theme);
-
// Get the URL to the zip file
$r = $current->response[ $theme ];
@@ -770,17 +901,45 @@ class Theme_Upgrader extends WP_Upgrader {
$this->skin->footer();
- // Cleanup our hooks, incase something else does a upgrade on this connection.
- remove_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
- remove_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
- remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
+ // Cleanup our hooks, in case something else does a upgrade on this connection.
+ remove_filter('upgrader_pre_install', array(&$this, 'current_before'));
+ remove_filter('upgrader_post_install', array(&$this, 'current_after'));
+ remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'));
// Force refresh of theme update information
- delete_site_transient('update_themes');
+ wp_clean_themes_cache();
+ do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'theme', 'bulk' => true ), $themes );
return $results;
}
+ function check_package($source) {
+ global $wp_filesystem;
+
+ if ( is_wp_error($source) )
+ return $source;
+
+ // Check the folder contains a valid theme
+ $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
+ if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
+ return $source;
+
+ // A proper archive should have a style.css file in the single subdirectory
+ if ( ! file_exists( $working_directory . 'style.css' ) )
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the style.css
stylesheet.') );
+
+ $info = get_file_data( $working_directory . 'style.css', array( 'Name' => 'Theme Name', 'Template' => 'Template' ) );
+
+ if ( empty( $info['Name'] ) )
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __("The style.css
stylesheet doesn't contain a valid theme header.") );
+
+ // If it's not a child theme, it must have at least an index.php to be legit.
+ if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) )
+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __('The theme is missing the index.php
file.') );
+
+ return $source;
+ }
+
function current_before($return, $theme) {
if ( is_wp_error($return) )
@@ -796,22 +955,21 @@ class Theme_Upgrader extends WP_Upgrader {
return $return;
}
+
function current_after($return, $theme) {
if ( is_wp_error($return) )
return $return;
$theme = isset($theme['theme']) ? $theme['theme'] : '';
- if ( $theme != get_stylesheet() ) //If not current
+ if ( $theme != get_stylesheet() ) // If not current
return $return;
- //Ensure stylesheet name hasnt changed after the upgrade:
- // @TODO: Note, This doesnt handle the Template changing, or the Template name changing.
+ // Ensure stylesheet name hasn't changed after the upgrade:
if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
- $theme_info = $this->theme_info();
+ wp_clean_themes_cache();
$stylesheet = $this->result['destination_name'];
- $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
- switch_theme($template, $stylesheet, true);
+ switch_theme( $stylesheet );
}
//Time to remove maintenance mode
@@ -843,13 +1001,13 @@ class Theme_Upgrader extends WP_Upgrader {
else
return false;
}
- return get_theme_data(WP_CONTENT_DIR . '/themes/' . $theme . '/style.css');
+ return wp_get_theme( $theme, WP_CONTENT_DIR . '/themes/' );
}
}
/**
- * Core Upgrader class for WordPress. It allows for WordPress to upgrade itself in combiantion with the wp-admin/includes/update-core.php file
+ * Core Upgrader class for WordPress. It allows for WordPress to upgrade itself in combination with the wp-admin/includes/update-core.php file
*
* @TODO More Detailed docs, for methods as well.
*
@@ -865,17 +1023,15 @@ class Core_Upgrader extends WP_Upgrader {
$this->strings['downloading_package'] = __('Downloading update from %s…');
$this->strings['unpack_package'] = __('Unpacking the update…');
$this->strings['copy_failed'] = __('Could not copy files.');
+ $this->strings['copy_failed_space'] = __('Could not copy files. You may have run out of disk space.' );
}
function upgrade($current) {
- global $wp_filesystem;
+ global $wp_filesystem, $wp_version;
$this->init();
$this->upgrade_strings();
- if ( !empty($feedback) )
- add_filter('update_feedback', $feedback);
-
// Is an update available?
if ( !isset( $current->response ) || $current->response == 'latest' )
return new WP_Error('up_to_date', $this->strings['up_to_date']);
@@ -886,7 +1042,21 @@ class Core_Upgrader extends WP_Upgrader {
$wp_dir = trailingslashit($wp_filesystem->abspath());
- $download = $this->download_package( $current->package );
+ // If partial update is returned from the API, use that, unless we're doing a reinstall.
+ // If we cross the new_bundled version number, then use the new_bundled zip.
+ // Don't though if the constant is set to skip bundled items.
+ // If the API returns a no_content zip, go with it. Finally, default to the full zip.
+ if ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version )
+ $to_download = 'partial';
+ elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
+ && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) )
+ $to_download = 'new_bundled';
+ elseif ( $current->packages->no_content )
+ $to_download = 'no_content';
+ else
+ $to_download = 'full';
+
+ $download = $this->download_package( $current->packages->$to_download );
if ( is_wp_error($download) )
return $download;
@@ -903,7 +1073,12 @@ class Core_Upgrader extends WP_Upgrader {
require(ABSPATH . 'wp-admin/includes/update-core.php');
- return update_core($working_dir, $wp_dir);
+ if ( ! function_exists( 'update_core' ) )
+ return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
+
+ $result = update_core( $working_dir, $wp_dir );
+ do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ), $result );
+ return $result;
}
}
@@ -923,9 +1098,6 @@ class WP_Upgrader_Skin {
var $done_header = false;
var $result = false;
- function WP_Upgrader_Skin($args = array()) {
- return $this->__construct($args);
- }
function __construct($args = array()) {
$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
$this->options = wp_parse_args($args, $defaults);
@@ -957,7 +1129,7 @@ class WP_Upgrader_Skin {
return;
$this->done_header = true;
echo '