Changeset 25861

Timestamp:

10/22/2013 04:36:54 AM (11 years ago)

Author:

nacin

Message:

Move upgrader_process_complete for core to its proper place in Core_Upgrader.

This means it will be firing as a JS redirect is taking place if the update is from pre-3.4. Acceptable.

props dd32.
fixes #25659.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-upgrader.php (modified) (1 diff)
• update-core.php (modified) (1 diff)

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

@@ -1407 +1407 @@
         }
 
+        do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ) );
+
         return $result;
     }

trunk/src/wp-admin/includes/update-core.php

@@ -892 +892 @@
     $wp_filesystem->delete($maintenance_file);
 
-    // Has to be in here, rather than the Upgrader as the filter below will override and kill the process before themes get updated on major updates
-    do_action( 'upgrader_process_complete', null, array( 'action' => 'update', 'type' => 'core' ) );
-
     // If we made it this far:
     do_action( '_core_updated_successfully', $wp_version );