X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/b609ea801799cbbd5f02d95e0dc547ab53a56f4c..6c8f14c09105d0afa4c1574215c59b5021040e76:/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..ef8fb5f8 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();
@@ -55,7 +52,7 @@ class WP_Upgrader {
 		$this->strings['installing_package'] = __('Installing the latest version…');
 		$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…');
@@ -156,6 +153,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;
 		}
 
@@ -193,8 +193,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'], __( 'The plugin contains no files.' ) ); //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.
+			$source = trailingslashit($source);
 
 		//Hook ability to change the source file location..
 		$source = apply_filters('upgrader_source_selection', $source, $remote_source, $this);
@@ -211,25 +212,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 ( $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 );
 			}
 		}
 
@@ -302,8 +303,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();
@@ -323,7 +326,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 +374,6 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$this->strings['no_package'] = __('Update package not available.');
 		$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
 		$this->strings['unpack_package'] = __('Unpacking the update&#8230;');
-		$this->strings['deactivate_plugin'] = __('Deactivating the plugin&#8230;');
 		$this->strings['remove_old'] = __('Removing the old version of the plugin&#8230;');
 		$this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
 		$this->strings['process_failed'] = __('Plugin update failed.');
@@ -392,6 +394,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 +404,16 @@ 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' );
 
+		return true;
 	}
 
 	function upgrade($plugin) {
@@ -424,7 +435,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 +447,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 +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) {
@@ -484,11 +496,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 +533,42 @@ 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' );
 
 		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 +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);
 		}
@@ -581,7 +619,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 			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 its not the root plugin folder
 			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
 		else
 			$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
@@ -589,7 +627,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 +643,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.');
@@ -624,6 +663,80 @@ class Theme_Upgrader extends WP_Upgrader {
 		$this->strings['installing_package'] = __('Installing the theme&#8230;');
 		$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 <strong>%1$s %2$s</strong>.');
+		$this->strings['parent_theme_search'] = __('This theme requires a parent theme. Checking if it is installed&#8230;');
+		/* translators: 1: theme name, 2: version */
+		$this->strings['parent_theme_prepare_install'] = __('Preparing to install <strong>%1$s %2$s</strong>&#8230;');
+		/* translators: 1: theme name, 2: version */
+		$this->strings['parent_theme_currently_installed'] = __('The parent theme, <strong>%1$s %2$s</strong>, is currently installed.');
+		/* translators: 1: theme name, 2: version */
+		$this->strings['parent_theme_install_success'] = __('Successfully installed the parent theme, <strong>%1$s %2$s</strong>.');
+		$this->strings['parent_theme_not_found'] = __('<strong>The parent theme could not be found.</strong> You will need to install the parent theme, <strong>%s</strong>, 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 +744,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 +756,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');
+		wp_clean_themes_cache();
 
-		if ( empty($result['destination_name']) )
-			return false;
-		else
-			return $result['destination_name'];
+		return true;
 	}
 
 	function upgrade($theme) {
@@ -685,11 +801,15 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		$this->run($options);
 
+		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);
+
 		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();
 
 		return true;
 	}
@@ -731,17 +851,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 +890,44 @@ class Theme_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_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);
 
 		// Force refresh of theme update information
-		delete_site_transient('update_themes');
+		wp_clean_themes_cache();
 
 		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 <code>style.css</code> 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 <code>style.css</code> 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 <code>index.php</code> file.') );
+
+		return $source;
+	}
+
 	function current_before($return, $theme) {
 
 		if ( is_wp_error($return) )
@@ -796,22 +943,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 +989,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,10 +1011,11 @@ class Core_Upgrader extends WP_Upgrader {
 		$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
 		$this->strings['unpack_package'] = __('Unpacking the update&#8230;');
 		$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();
@@ -886,7 +1033,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,6 +1064,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);
 	}
 
@@ -923,9 +1087,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);
@@ -1012,10 +1173,6 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
 	var $plugin_active = false;
 	var $plugin_network_active = false;
 
-	function Plugin_Upgrader_Skin($args = array()) {
-		return $this->__construct($args);
-	}
-
 	function __construct($args = array()) {
 		$defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
 		$args = wp_parse_args($args, $defaults);
@@ -1031,7 +1188,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&#8230;'));
 			echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
 		}
 
@@ -1039,9 +1195,7 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
 			'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',
 			'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>'
 		);
-		if ( $this->plugin_active )
-			unset( $update_actions['activate_plugin'] );
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
 			unset( $update_actions['activate_plugin'] );
 
 		$update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $this->plugin);
@@ -1068,10 +1222,6 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 	var $in_loop = false;
 	var $error = false;
 
-	function Bulk_Upgrader_Skin($args = array()) {
-		return $this->__construct($args);
-	}
-
 	function __construct($args = array()) {
 		$defaults = array( 'url' => '', 'nonce' => '' );
 		$args = wp_parse_args($args, $defaults);
@@ -1138,8 +1288,8 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 
 	function before($title = '') {
 		$this->in_loop = true;
-		printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <img alt="" src="' . admin_url( 'images/wpspin_light.gif' ) . '" class="hidden waiting-' . $this->upgrader->update_current . '" style="vertical-align:middle;" /></h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
+		printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
+		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').css("display", "inline-block");</script>';
 		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
 		$this->flush_output();
 	}
@@ -1176,7 +1326,8 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 
 class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
 	var $plugin_info = array(); // Plugin_Upgrader::bulk() will fill this in.
-	function Plugin_Upgrader_Skin($args = array()) {
+
+	function __construct($args = array()) {
 		parent::__construct($args);
 	}
 
@@ -1198,6 +1349,8 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
 			'plugins_page' => '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Go to plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>',
 			'updates_page' => '<a href="' . self_admin_url('update-core.php') . '" title="' . esc_attr__('Go to WordPress Updates page') . '" target="_parent">' . __('Return to WordPress Updates') . '</a>'
 		);
+		if ( ! current_user_can( 'activate_plugins' ) )
+			unset( $update_actions['plugins_page'] );
 
 		$update_actions = apply_filters('update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info);
 		if ( ! empty($update_actions) )
@@ -1207,7 +1360,8 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
 
 class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
 	var $theme_info = array(); // Theme_Upgrader::bulk() will fill this in.
-	function Theme_Upgrader_Skin($args = array()) {
+
+	function __construct($args = array()) {
 		parent::__construct($args);
 	}
 
@@ -1217,20 +1371,23 @@ 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(
 			'themes_page' => '<a href="' . self_admin_url('themes.php') . '" title="' . esc_attr__('Go to themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>',
 			'updates_page' => '<a href="' . self_admin_url('update-core.php') . '" title="' . esc_attr__('Go to WordPress Updates page') . '" target="_parent">' . __('Return to WordPress Updates') . '</a>'
 		);
+		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) )
+			unset( $update_actions['themes_page'] );
 
-		$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));
 	}
@@ -1249,10 +1406,6 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
 	var $api;
 	var $type;
 
-	function Plugin_Installer_Skin($args = array()) {
-		return $this->__construct($args);
-	}
-
 	function __construct($args = array()) {
 		$defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
 		$args = wp_parse_args($args, $defaults);
@@ -1293,11 +1446,12 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
 		else
 			$install_actions['plugins_page'] = '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Return to Plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>';
 
-
 		if ( ! $this->result || is_wp_error($this->result) ) {
+			unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
+		} elseif ( ! current_user_can( 'activate_plugins' ) ) {
 			unset( $install_actions['activate_plugin'] );
-			unset( $install_actions['network_activate'] );
 		}
+
 		$install_actions = apply_filters('install_plugin_complete_actions', $install_actions, $this->api, $plugin_file);
 		if ( ! empty($install_actions) )
 			$this->feedback(implode(' | ', (array)$install_actions));
@@ -1317,10 +1471,6 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 	var $api;
 	var $type;
 
-	function Theme_Installer_Skin($args = array()) {
-		return $this->__construct($args);
-	}
-
 	function __construct($args = array()) {
 		$defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
 		$args = wp_parse_args($args, $defaults);
@@ -1332,10 +1482,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 <strong>%1$s %2$s</strong>.'), $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() {
@@ -1343,26 +1491,40 @@ 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&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
+		$preview_link = add_query_arg( array(
+			'preview'    => 1,
+			'template'   => urlencode( $template ),
+			'stylesheet' => urlencode( $stylesheet ),
+		), trailingslashit( home_url() ) );
 
-		$install_actions = array(
-			'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>',
-			'activate' => '<a href="' . $activate_link .  '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>'
-							);
+		$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']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-customize" title="' . esc_attr( sprintf( __('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Preview') . '</a>';
+		$install_actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize" title="' . esc_attr( sprintf( __('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Live Preview') . '</a>';
+		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
+
+		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
+			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" title="' . esc_attr__( 'Enable this theme for all sites in this network' ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
 
 		if ( $this->type == 'web' )
 			$install_actions['themes_page'] = '<a href="' . self_admin_url('theme-install.php') . '" title="' . esc_attr__('Return to Theme Installer') . '" target="_parent">' . __('Return to Theme Installer') . '</a>';
-		else
+		elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
 			$install_actions['themes_page'] = '<a href="' . self_admin_url('themes.php') . '" title="' . esc_attr__('Themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>';
 
-		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() )
+		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) )
 			unset( $install_actions['activate'], $install_actions['preview'] );
 
 		$install_actions = apply_filters('install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info);
@@ -1383,10 +1545,6 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 	var $theme = '';
 
-	function Theme_Upgrader_Skin($args = array()) {
-		return $this->__construct($args);
-	}
-
 	function __construct($args = array()) {
 		$defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
 		$args = wp_parse_args($args, $defaults);
@@ -1399,22 +1557,35 @@ 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&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
-
-			$update_actions['preview'] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>';
-			$update_actions['activate'] = '<a href="' . $activate_link .  '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
+			$template   = $theme_info->get_template();
+
+			$preview_link = add_query_arg( array(
+				'preview'    => 1,
+				'template'   => urlencode( $template ),
+				'stylesheet' => urlencode( $stylesheet ),
+			), trailingslashit( 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 ) {
+				if ( current_user_can( 'edit_theme_options' ) )
+					$update_actions['preview']  = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize" title="' . esc_attr( sprintf( __('Customize &#8220;%s&#8221;'), $name ) ) . '">' . __('Customize') . '</a>';
+			} elseif ( current_user_can( 'switch_themes' ) ) {
+				$update_actions['preview']  = '<a href="' . esc_url( $preview_link ) . '" class="hide-if-customize" title="' . esc_attr( sprintf( __('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Preview') . '</a>';
+				$update_actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize" title="' . esc_attr( sprintf( __('Preview &#8220;%s&#8221;'), $name ) ) . '">' . __('Live Preview') . '</a>';
+				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
+			}
 
-			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'] = '<a href="' . self_admin_url('themes.php') . '" title="' . esc_attr__('Return to Themes page') . '" target="_parent">' . __('Return to Themes page') . '</a>';
@@ -1437,32 +1608,66 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 class File_Upload_Upgrader {
 	var $package;
 	var $filename;
+	var $id = 0;
 
-	function File_Upload_Upgrader($form, $urlholder) {
-		return $this->__construct($form, $urlholder);
-	}
 	function __construct($form, $urlholder) {
-		if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-			wp_die($uploads['error']);
 
 		if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) )
 			wp_die(__('Please select a file'));
 
-		if ( !empty($_FILES) )
-			$this->filename = $_FILES[$form]['name'];
-		else if ( isset($_GET[$urlholder]) )
-			$this->filename = $_GET[$urlholder];
-
 		//Handle a newly uploaded file, Else assume its already been uploaded
-		if ( !empty($_FILES) ) {
-			$this->filename = wp_unique_filename( $uploads['basedir'], $this->filename );
-			$this->package = $uploads['basedir'] . '/' . $this->filename;
+		if ( ! empty($_FILES) ) {
+			$overrides = array( 'test_form' => false, 'test_type' => false );
+			$file = wp_handle_upload( $_FILES[$form], $overrides );
+
+			if ( isset( $file['error'] ) )
+				wp_die( $file['error'] );
 
-			// Move the file to the uploads dir
-			if ( false === @ move_uploaded_file( $_FILES[$form]['tmp_name'], $this->package) )
-				wp_die( sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path']));
+			$this->filename = $_FILES[$form]['name'];
+			$this->package = $file['file'];
+
+			// Construct the object array
+			$object = array(
+				'post_title' => $this->filename,
+				'post_content' => $file['url'],
+				'post_mime_type' => $file['type'],
+				'guid' => $file['url'],
+				'context' => 'upgrader',
+				'post_status' => 'private'
+			);
+
+			// Save the data
+			$this->id = wp_insert_attachment( $object, $file['file'] );
+
+			// schedule a cleanup for 2 hours from now in case of failed install
+			wp_schedule_single_event( time() + 7200, 'upgrader_scheduled_cleanup', array( $this->id ) );
+
+		} elseif ( is_numeric( $_GET[$urlholder] ) ) {
+			// Numeric Package = previously uploaded file, see above.
+			$this->id = (int) $_GET[$urlholder];
+			$attachment = get_post( $this->id );
+			if ( empty($attachment) )
+				wp_die(__('Please select a file'));
+
+			$this->filename = $attachment->post_title;
+			$this->package = get_attached_file( $attachment->ID );
 		} else {
+			// Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler.
+			if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
+				wp_die( $uploads['error'] );
+
+			$this->filename = $_GET[$urlholder];
 			$this->package = $uploads['basedir'] . '/' . $this->filename;
 		}
 	}
+
+	function cleanup() {
+		if ( $this->id )
+			wp_delete_attachment( $this->id );
+
+		elseif ( file_exists( $this->package ) )
+			return @unlink( $this->package );
+
+		return true;
+	}
 }
\ No newline at end of file