Changeset 42811 for branches/4.9/src/wp-admin/themes.php

Timestamp:

03/09/2018 12:14:20 AM (2 years ago)

Author:

SergeyBiryukov

Message:

General: Replace Cheatin’ uh? with friendlier error messages.

While intended as a playful error message, Cheatin’ uh? can be interpreted as insulting or accusatory in an already stressful situation. This replaces Cheatin’ with more meaningful error messages, depending on the error that occurs.

Props ElectricFeet, EricMeyer, karmatosed, dd32, BandonRandon, melchoyce, kristastevens for language; dmsnell for original patch; peterwilsoncc.
Merged [42648] and [42719] to the 4.9 branch.
Fixes #38332.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/themes.php (modified) (4 diffs)

branches/4.9/src/wp-admin/themes.php

@@ -12 +12 @@
 if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
     wp_die(
-        '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+        '<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
         '<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
         403
@@ -25 +25 @@
         if ( ! $theme->exists() || ! $theme->is_allowed() ) {
             wp_die(
-                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                '<h1>' . __( 'Something went wrong.' ) . '</h1>' .
                 '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
                 403
@@ -40 +40 @@
         if ( ! current_user_can( 'delete_themes' ) ) {
             wp_die(
-                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                '<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
                 '<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
                 403
@@ -48 +48 @@
         if ( ! $theme->exists() ) {
             wp_die(
-                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                '<h1>' . __( 'Something went wrong.' ) . '</h1>' .
                 '<p>' . __( 'The requested theme does not exist.' ) . '</p>',
                 403