Ticket #12089: 12089.deactivation-header-variant.patch

wp-admin/plugins.php

@@ -166 +166 @@
                                 wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
 
                         check_admin_referer('deactivate-plugin_' . $plugin);
+                        $redirect_url = "plugins.php?deactivate=true&plugin_status={$status}&paged={$page}";
+                        $header_sent  = headers_sent();  
+                        !$header_sent && wp_redirect( $redirect_url ); // output for later
                         deactivate_plugins($plugin);
-                        update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated'));
-                        if (headers_sent())
-                                echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page" ) . "' />";
-                        else
-                                wp_redirect("plugins.php?deactivate=true&plugin_status=$status&paged=$page");
+                        update_option( 'recently_activated', array( $plugin => time() ) + (array) get_option( 'recently_activated' ) );
+                        $header_sent && printf( '<meta http-equiv="refresh" content="0;url=%s" />', esc_attr( $redirect_url ) );                                
                         exit;
                         break;
                 case 'deactivate-selected':