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

Timestamp:

03/09/2018 12:14:20 AM (9 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/custom-header.php (modified) (3 diffs)

branches/4.9/src/wp-admin/custom-header.php

@@ -720 +720 @@
                 if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
                         wp_die(
-                                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                                '<h1>' . __( 'Something went wrong.' ) . '</h1>' .
                                 '<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
                                 403
@@ -878 +878 @@
                 if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
                         wp_die(
-                                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                                '<h1>' . __( 'Something went wrong.' ) . '</h1>' .
                                 '<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
                                 403
@@ -886 +886 @@
                 if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
                         wp_die(
-                                '<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+                                '<h1>' . __( 'Something went wrong.' ) . '</h1>' .
                                 '<p>' . __( 'The current theme does not support a flexible sized header image.' ) . '</p>',
                                 403