WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WP_Upgrader: Add upgrader_process_complete hooks and add a abort_if_destination_exists flag (default is true). props dd32. see #18200. 

git-svn-id: http://core.svn.wordpress.org/trunk@23912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-04-04 21:10:54 +00:00
parent b706f91278
commit bc7082a7c3
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-admin/includes/class-wp-upgrader.php
View File

@ -166,6 +166,7 @@ class WP_Upgrader {
global $wp_filesystem; global $wp_filesystem;
$defaults = array( 'source' => '', 'destination' => '', //Please always pass these $defaults = array( 'source' => '', 'destination' => '', //Please always pass these
'clear_destination' => false, 'clear_working' => false, 'clear_destination' => false, 'clear_working' => false,
'abort_if_destination_exists' => true,
'hook_extra' => array()); 'hook_extra' => array());
$args = wp_parse_args($args, $defaults); $args = wp_parse_args($args, $defaults);
@ -224,7 +225,7 @@ class WP_Upgrader {
return $removed; return $removed;
else if ( ! $removed ) else if ( ! $removed )
return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']); return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
} elseif ( $wp_filesystem->exists($remote_destination) ) { } elseif ( $abort_if_destination_exists && $wp_filesystem->exists($remote_destination) ) {
//If we're not clearing the destination folder and something exists there already, Bail. //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. //But first check to see if there are actually any files in the folder.
$_files = $wp_filesystem->dirlist($remote_destination); $_files = $wp_filesystem->dirlist($remote_destination);
@ -272,6 +273,7 @@ class WP_Upgrader {
$defaults = array( 'package' => '', //Please always pass this. $defaults = array( 'package' => '', //Please always pass this.
'destination' => '', //And this 'destination' => '', //And this
'clear_destination' => false, 'clear_destination' => false,
'abort_if_destination_exists' => true, // Abort if the Destination directory exists, Pass clear_destination as false please
'clear_working' => true, 'clear_working' => true,
'is_multi' => false, 'is_multi' => false,
'hook_extra' => array() //Pass any extra $hook_extra args here, this will be passed to any hooked filters. 'hook_extra' => array() //Pass any extra $hook_extra args here, this will be passed to any hooked filters.
@ -318,6 +320,7 @@ class WP_Upgrader {
'source' => $working_dir, 'source' => $working_dir,
'destination' => $destination, 'destination' => $destination,
'clear_destination' => $clear_destination, 'clear_destination' => $clear_destination,
'abort_if_destination_exists' => $abort_if_destination_exists,
'clear_working' => $clear_working, 'clear_working' => $clear_working,
'hook_extra' => $hook_extra 'hook_extra' => $hook_extra
) ); ) );
@ -412,6 +415,7 @@ class Plugin_Upgrader extends WP_Upgrader {
// Force refresh of plugin update information // Force refresh of plugin update information
delete_site_transient('update_plugins'); delete_site_transient('update_plugins');
wp_cache_delete( 'plugins', 'plugins' ); wp_cache_delete( 'plugins', 'plugins' );
do_action( 'upgrader_process_complete', $this, array( 'action' => 'install', 'type' => 'plugin' ), $package );
return true; return true;
} }
@ -457,6 +461,7 @@ class Plugin_Upgrader extends WP_Upgrader {
// Force refresh of plugin update information // Force refresh of plugin update information
delete_site_transient('update_plugins'); delete_site_transient('update_plugins');
wp_cache_delete( 'plugins', 'plugins' ); wp_cache_delete( 'plugins', 'plugins' );
do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'plugin' ), $plugin );
} }
function bulk_upgrade($plugins) { function bulk_upgrade($plugins) {
@ -539,6 +544,7 @@ class Plugin_Upgrader extends WP_Upgrader {
// Force refresh of plugin update information // Force refresh of plugin update information
delete_site_transient('update_plugins'); delete_site_transient('update_plugins');
wp_cache_delete( 'plugins', 'plugins' ); wp_cache_delete( 'plugins', 'plugins' );
do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'plugin', 'bulk' => true ), $plugins );
return $results; return $results;
} }
@ -764,6 +770,7 @@ class Theme_Upgrader extends WP_Upgrader {
// Force refresh of theme update information // Force refresh of theme update information
wp_clean_themes_cache(); wp_clean_themes_cache();
do_action( 'upgrader_process_complete', $this, array( 'action' => 'install', 'type' => 'theme' ), $package );
return true; return true;
} }
@ -810,6 +817,7 @@ class Theme_Upgrader extends WP_Upgrader {
// Force refresh of theme update information // Force refresh of theme update information
wp_clean_themes_cache(); wp_clean_themes_cache();
do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'theme' ), $theme );
return true; return true;
} }
@ -897,6 +905,7 @@ class Theme_Upgrader extends WP_Upgrader {
// Force refresh of theme update information // Force refresh of theme update information
wp_clean_themes_cache(); wp_clean_themes_cache();
do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'theme', 'bulk' => true ), $themes );
return $results; return $results;
} }
@ -1067,7 +1076,9 @@ class Core_Upgrader extends WP_Upgrader {
if ( ! function_exists( 'update_core' ) ) if ( ! function_exists( 'update_core' ) )
return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] ); return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
return update_core($working_dir, $wp_dir); $result = update_core( $working_dir, $wp_dir );
do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ), $result );
return $result;
} }
} }