Ticket #46812: 46812.diff

src/wp-admin/includes/plugin.php

@@ -766 +766 @@
                         }
                 }
 
+                if ( $do_blog && wp_is_recovery_mode() ) {
+                        list( $extension ) = explode( '/', $plugin );
+                        wp_paused_plugins()->delete( $extension );
+                }
+
                 if ( ! $silent ) {
                         /**
                          * Fires as a specific plugin is being deactivated.

src/wp-includes/theme.php

@@ -744 +744 @@
         $new_theme = wp_get_theme( $stylesheet );
         $template  = $new_theme->get_template();
 
+        if ( wp_is_recovery_mode() ) {
+                $paused_themes = wp_paused_themes();
+                $paused_themes->delete( $old_theme->get_stylesheet() );
+                $paused_themes->delete( $old_theme->get_template() );
+        }
+
         update_option( 'template', $template );
         update_option( 'stylesheet', $stylesheet );