Ticket #33677: 33677.diff

src/wp-admin/themes.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('switch_themes') && !current_user_can('edit_theme_options') )
-        wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can('switch_themes') && ! current_user_can('edit_theme_options') ) {
+        wp_die(
+                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                '<p>' . __( 'You are not allowed to manage these items.' ) . '</p>',
+                403 );
+}
 
 if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
         if ( 'activate' == $_GET['action'] ) {
                 check_admin_referer('switch-theme_' . $_GET['stylesheet']);
                 $theme = wp_get_theme( $_GET['stylesheet'] );
-                if ( ! $theme->exists() || ! $theme->is_allowed() )
-                        wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+                if ( ! $theme->exists() || ! $theme->is_allowed() ) {
+                        wp_die(
+                                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                                '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
+                                403 );
+                }
                 switch_theme( $theme->get_stylesheet() );
                 wp_redirect( admin_url('themes.php?activated=true') );
                 exit;
@@ -24 +32 @@
         } elseif ( 'delete' == $_GET['action'] ) {
                 check_admin_referer('delete-theme_' . $_GET['stylesheet']);
                 $theme = wp_get_theme( $_GET['stylesheet'] );
-                if ( !current_user_can('delete_themes') || ! $theme->exists() )
-                        wp_die( __( 'Cheatin&#8217; uh?' ), 403 );
+                if ( ! current_user_can('delete_themes') ) {
+                        wp_die(
+                                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                                '<p>' . __( 'You are not allowed to delete this item.' ) . '</p>',
+                                403 );
+                }
+                if ( ! $theme->exists() ) {
+                        wp_die(
+                                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                                '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
+                                403 );
+                }
                 $active = wp_get_theme();
                 if ( $active->get( 'Template' ) == $_GET['stylesheet'] ) {
                         wp_redirect( admin_url( 'themes.php?delete-active-child=true' ) );