Ticket #15707: 15707.patch

wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -281 +281 @@
 
                 if ( current_user_can('edit_themes') )
                         $actions['edit'] = '<a href="theme-editor.php?theme=' . $theme['Name'] . '" title="' . __('Open this theme in the Theme Editor') . '" class="edit">' . __('Edit') . '</a>';
+                        
+                if ( empty( $theme['enabled'] ) && current_user_can( 'delete_themes' ) && ! $this->is_site_themes )
+                        $actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$theme_key", 'delete-theme_' . $theme_key ) . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'.\nWarning: Other sites may be using that theme still!\n'Cancel' to stop, 'OK' to delete." ), $theme['Name'] ) ) . "' );" . '">' . __( 'Delete' ) . '</a>';
 
                 $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme_key, $theme, $context );
                 $actions = apply_filters( "theme_action_links_$theme_key", $actions, $theme_key, $theme, $context );

wp-admin/network/themes.php

@@ -58 +58 @@
                                 unset( $allowed_themes[ $theme ] );
                         update_site_option( 'allowedthemes', $allowed_themes );
                         break;
+                case 'delete':
+                        check_admin_referer('delete-theme_' . $_GET['template']);
+                        if ( !current_user_can('delete_themes') )
+                                wp_die( __( 'Cheatin’ uh?' ) );
+                        delete_theme($_GET['template']);
+                        wp_redirect( self_admin_url('themes.php?deleted=true') );
+                        exit;
+                        break;
         }
 }
 
@@ -80 +88 @@
 
 require_once(ABSPATH . 'wp-admin/admin-header.php');
 
-?>
+if ( isset($_GET['deleted']) ) { ?>
+<div class="updated"><p><?php _e('Theme deleted.') ?></p></div>
+<?php } ?>
 
 <div class="wrap">
 <?php screen_icon('themes'); ?>