X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..cd3609994b39a094ff7528b93f55631bb213fd7f:/wp-admin/includes/class-wp-upgrader.php?ds=inline
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index e61e0ef5..846cbe5f 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -374,7 +374,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.');
@@ -412,6 +411,7 @@ class Plugin_Upgrader extends WP_Upgrader {
// Force refresh of plugin update information
delete_site_transient('update_plugins');
+ wp_cache_delete( 'plugins', 'plugins' );
return true;
}
@@ -456,6 +456,7 @@ class Plugin_Upgrader extends WP_Upgrader {
// Force refresh of plugin update information
delete_site_transient('update_plugins');
+ wp_cache_delete( 'plugins', 'plugins' );
}
function bulk_upgrade($plugins) {
@@ -537,6 +538,7 @@ class Plugin_Upgrader extends WP_Upgrader {
// Force refresh of plugin update information
delete_site_transient('update_plugins');
+ wp_cache_delete( 'plugins', 'plugins' );
return $results;
}
@@ -594,7 +596,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);
}
@@ -662,6 +663,80 @@ class Theme_Upgrader extends WP_Upgrader {
$this->strings['installing_package'] = __('Installing the theme…');
$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) {
@@ -670,6 +745,7 @@ class Theme_Upgrader extends WP_Upgrader {
$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,
@@ -681,12 +757,16 @@ 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'), 10, 3);
if ( ! $this->result || is_wp_error($this->result) )
return $this->result;
// Force refresh of theme update information
delete_site_transient('update_themes');
+ search_theme_directories( true );
+ foreach ( wp_get_themes() as $theme )
+ $theme->cache_delete();
return true;
}
@@ -733,6 +813,9 @@ class Theme_Upgrader extends WP_Upgrader {
// Force refresh of theme update information
delete_site_transient('update_themes');
+ search_theme_directories( true );
+ foreach ( wp_get_themes() as $theme )
+ $theme->cache_delete();
return true;
}
@@ -820,6 +903,9 @@ class Theme_Upgrader extends WP_Upgrader {
// Force refresh of theme update information
delete_site_transient('update_themes');
+ search_theme_directories( true );
+ foreach ( wp_get_themes() as $theme )
+ $theme->cache_delete();
return $results;
}
@@ -835,14 +921,17 @@ class Theme_Upgrader extends WP_Upgrader {
if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, lets not prevent installation.
return $source;
- if ( ! file_exists( $working_directory . 'style.css' ) ) // A proper archive should have a style.css file in the single subdirectory
+ // 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_theme_data( $working_directory . 'style.css' );
- if ( empty($info['Name']) )
+ $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 ( empty($info['Template']) && ! file_exists( $working_directory . 'index.php' ) ) // If no template is set, it must have at least an index.php to be legit.
+ // 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;
@@ -870,15 +959,15 @@ class Theme_Upgrader extends WP_Upgrader {
$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:
+ // Ensure stylesheet name hasnt changed after the upgrade:
// @TODO: Note, This doesn't handle the Template changing, or the Template name changing.
if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
$theme_info = $this->theme_info();
$stylesheet = $this->result['destination_name'];
- $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
+ $template = $theme_info->get_template();
switch_theme($template, $stylesheet, true);
}
@@ -911,7 +1000,7 @@ 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/' );
}
}
@@ -933,6 +1022,7 @@ 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) {
@@ -985,6 +1075,9 @@ class Core_Upgrader extends WP_Upgrader {
require(ABSPATH . 'wp-admin/includes/update-core.php');
+ if ( ! function_exists( 'update_core' ) )
+ return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
+
return update_core($working_dir, $wp_dir);
}
@@ -1106,7 +1199,6 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
function after() {
$this->plugin = $this->upgrader->plugin_info();
if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
- show_message(__('Reactivating the plugin…'));
echo '';
}
@@ -1290,12 +1382,13 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
}
function before() {
- parent::before($this->theme_info['Name']);
+ parent::before( $this->theme_info->display('Name') );
}
function after() {
- parent::after($this->theme_info['Name']);
+ parent::after( $this->theme_info->display('Name') );
}
+
function bulk_footer() {
parent::bulk_footer();
$update_actions = array(
@@ -1303,7 +1396,7 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
'updates_page' => '' . __('Return to WordPress Updates') . ''
);
- $update_actions = apply_filters('update_bulk_theme_complete_actions', $update_actions, $this->theme_info);
+ $update_actions = apply_filters('update_bulk_theme_complete_actions', $update_actions, $this->theme_info );
if ( ! empty($update_actions) )
$this->feedback(implode(' | ', (array)$update_actions));
}
@@ -1362,7 +1455,6 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
else
$install_actions['plugins_page'] = '' . __('Return to Plugins page') . '';
-
if ( ! $this->result || is_wp_error($this->result) ) {
unset( $install_actions['activate_plugin'] );
unset( $install_actions['network_activate'] );
@@ -1397,10 +1489,8 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
}
function before() {
- if ( !empty($this->api) ) {
- /* translators: 1: theme name, 2: version */
- $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the theme %1$s %2$s.'), $this->api->name, $this->api->version);
- }
+ if ( !empty($this->api) )
+ $this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
}
function after() {
@@ -1408,22 +1498,33 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
return;
$theme_info = $this->upgrader->theme_info();
- if ( empty($theme_info) )
+ if ( empty( $theme_info ) )
return;
- $name = $theme_info['Name'];
+
+ $name = $theme_info->display('Name');
$stylesheet = $this->upgrader->result['destination_name'];
- $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
+ $template = $theme_info->get_template();
- $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => 1, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
- $activate_link = wp_nonce_url("themes.php?action=activate&template=" . urlencode($template) . "&stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
+ $preview_link = add_query_arg( array(
+ 'preview' => 1,
+ 'template' => urlencode( $template ),
+ 'stylesheet' => urlencode( $stylesheet ),
+ ), trailingslashit( get_home_url() ) );
- $install_actions = array(
- 'preview' => '' . __('Preview') . '',
- 'activate' => '' . __('Activate') . ''
- );
+ $activate_link = add_query_arg( array(
+ 'action' => 'activate',
+ 'template' => urlencode( $template ),
+ 'stylesheet' => urlencode( $stylesheet ),
+ ), admin_url('themes.php') );
+ $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
+
+ $install_actions = array();
+ $install_actions['preview'] = '' . __('Preview') . '';
+ $install_actions['preview'] .= '' . __('Live Preview') . '';
+ $install_actions['activate'] = '' . __('Activate') . '';
if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
- $install_actions['network_enable'] = '' . __( 'Network Enable' ) . '';
+ $install_actions['network_enable'] = '' . __( 'Network Enable' ) . '';
if ( $this->type == 'web' )
$install_actions['themes_page'] = '' . __('Return to Theme Installer') . '';
@@ -1463,22 +1564,34 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
function after() {
$update_actions = array();
- if ( !empty($this->upgrader->result['destination_name']) &&
- ($theme_info = $this->upgrader->theme_info()) &&
- !empty($theme_info) ) {
-
- $name = $theme_info['Name'];
+ if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) {
+ $name = $theme_info->display('Name');
$stylesheet = $this->upgrader->result['destination_name'];
- $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
-
- $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
- $activate_link = wp_nonce_url("themes.php?action=activate&template=" . urlencode($template) . "&stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
-
- $update_actions['preview'] = '' . __('Preview') . '';
- $update_actions['activate'] = '' . __('Activate') . '';
+ $template = $theme_info->get_template();
+
+ $preview_link = add_query_arg( array(
+ 'preview' => 1,
+ 'template' => urlencode( $template ),
+ 'stylesheet' => urlencode( $stylesheet ),
+ ), trailingslashit( get_home_url() ) );
+
+ $activate_link = add_query_arg( array(
+ 'action' => 'activate',
+ 'template' => urlencode( $template ),
+ 'stylesheet' => urlencode( $stylesheet ),
+ ), admin_url('themes.php') );
+ $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
+
+ if ( get_stylesheet() == $stylesheet ) {
+ $update_actions['preview'] = '' . __('Customize') . '';
+ } else {
+ $update_actions['preview'] = '' . __('Preview') . '';
+ $update_actions['preview'] .= '' . __('Live Preview') . '';
+ $update_actions['activate'] = '' . __('Activate') . '';
+ }
- if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() )
- unset($update_actions['preview'], $update_actions['activate']);
+ if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() )
+ unset( $update_actions['preview'], $update_actions['activate'] );
}
$update_actions['themes_page'] = '' . __('Return to Themes page') . '';
@@ -1563,4 +1676,4 @@ class File_Upload_Upgrader {
return true;
}
-}
+}
\ No newline at end of file