Changeset 30697

Timestamp:

12/02/2014 02:20:14 AM (10 years ago)

Author:

johnbillion

Message:

Prevent the deletion of a theme while it has an active child theme.

Fixes #29580
Props karpstrucking, jesin

Location:

trunk/src/wp-admin

Files:

• includes/theme.php (modified) (2 diffs)
• themes.php (modified) (2 diffs)

trunk/src/wp-admin/includes/theme.php

@@ -425 +425 @@
     WP_Theme::sort_by_name( $themes );
     foreach ( $themes as $theme ) {
+        $slug = $theme->get_stylesheet();
+        $encoded_slug = urlencode( $slug );
+
         $parent = false;
         if ( $theme->parent() ) {
             $parent = $theme->parent()->display( 'Name' );
-        }
-
-        $slug = $theme->get_stylesheet();
-        $encoded_slug = urlencode( $slug );
+            $parents[ $slug ] = $theme->parent()->get_stylesheet();
+        }
 
         $prepared_themes[ $slug ] = array(
@@ -461 +462 @@
     }
 
+    // Remove 'delete' action if theme has an active child
+    if ( isset( $parents ) && array_key_exists( $current_theme, $parents ) ) {
+        unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
+    }
+
     /**
      * Filter the themes prepared for JavaScript, for themes.php.

trunk/src/wp-admin/themes.php

@@ -27 +27 @@
         if ( !current_user_can('delete_themes') || ! $theme->exists() )
             wp_die( __( 'Cheatin’ uh?' ), 403 );
-        delete_theme($_GET['stylesheet']);
-        wp_redirect( admin_url('themes.php?deleted=true') );
+        $active = wp_get_theme();
+        if ( $active->get( 'Template' ) == $_GET['stylesheet'] ) {
+            wp_redirect( admin_url( 'themes.php?delete-active-child=true' ) );
+        } else {
+            delete_theme( $_GET['stylesheet'] );
+            wp_redirect( admin_url( 'themes.php?deleted=true' ) );
+        }
         exit;
     }
@@ -134 +139 @@
     elseif ( isset($_GET['deleted']) ) : ?>
 <div id="message3" class="updated"><p><?php _e('Theme deleted.') ?></p></div>
+<?php elseif ( isset( $_GET['delete-active-child'] ) ) : ?>
+    <div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
 <?php
 endif;