Changeset 33866

Timestamp:

09/02/2015 06:44:07 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Provide more helpful feedback than just "Cheatin' uh?" for permission errors in wp-admin/themes.php.

props ericlewis, kraftbj, lukecarbis, mrmist.
fixes #33677. see #14530.

File:

• trunk/src/wp-admin/themes.php (modified) (3 diffs)

trunk/src/wp-admin/themes.php

@@ -10 +10 @@
 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 edit theme options on this site.' ) . '</p>',
+        403
+    );
+}
 
 if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
@@ -17 +22 @@
         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') );
@@ -25 +37 @@
         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'] ) {