Changeset 23912

Timestamp:

04/04/2013 09:10:54 PM (12 years ago)

Author:

nacin

Message:

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

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (11 diffs)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -167 +167 @@
         $defaults = array( 'source' => '', 'destination' => '', //Please always pass these
                         'clear_destination' => false, 'clear_working' => false,
+                        'abort_if_destination_exists' => true,
                         'hook_extra' => array());
 
@@ -225 +226 @@
             else if ( ! $removed )
                 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.
             //But first check to see if there are actually any files in the folder.
@@ -273 +274 @@
                             '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,
@@ -319 +321 @@
                                             'destination' => $destination,
                                             'clear_destination' => $clear_destination,
+                                            'abort_if_destination_exists' => $abort_if_destination_exists,
                                             'clear_working' => $clear_working,
                                             'hook_extra' => $hook_extra
@@ -413 +416 @@
         delete_site_transient('update_plugins');
         wp_cache_delete( 'plugins', 'plugins' );
+        do_action( 'upgrader_process_complete', $this, array( 'action' => 'install', 'type' => 'plugin' ), $package );
 
         return true;
@@ -458 +462 @@
         delete_site_transient('update_plugins');
         wp_cache_delete( 'plugins', 'plugins' );
+        do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'plugin' ), $plugin );
     }
 
@@ -540 +545 @@
         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;
@@ -765 +771 @@
         // Force refresh of theme update information
         wp_clean_themes_cache();
+        do_action( 'upgrader_process_complete', $this, array( 'action' => 'install', 'type' => 'theme' ), $package );
 
         return true;
@@ -811 +818 @@
         // Force refresh of theme update information
         wp_clean_themes_cache();
+        do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'theme' ), $theme );
 
         return true;
@@ -898 +906 @@
         // Force refresh of theme update information
         wp_clean_themes_cache();
+        do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'theme', 'bulk' => true ), $themes );
 
         return $results;
@@ -1068 +1077 @@
             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;
     }