Changeset 45268 for trunk/src/wp-includes/class-wp-recovery-mode-email-service.php

Timestamp:

04/25/2019 12:46:39 AM (5 years ago)

Author:

pento

Message:

Bootstrap/Load: Tweak the recovery mode email text and behaviour.

• Change the recovery mode link expiry to 1 day.
• Improve the email text.
• Add a new recovery_email_support_info filter, for hosts to be able to customise their support contact information.

Props pento, chanthaboune, michelleweber, matt.
Fixes #46898.

File:

• trunk/src/wp-includes/class-wp-recovery-mode-email-service.php (modified) (6 diffs)

trunk/src/wp-includes/class-wp-recovery-mode-email-service.php

@@ -123 +123 @@
         }
 
+        /**
+         * Filters the support message sent with the the fatal error protection email.
+         *
+         * @since 5.2.0
+         *
+         * @param $message string The Message to include in the email.
+         */
+        $support = apply_filters( 'recovery_email_support_info', __( 'Please contact your host for assistance with investigating this issue further.' ) );
+
+        /* translators: Do not translate LINK, EXPIRES, CAUSE, DETAILS, SITEURL, PAGEURL, SUPPORT: those are placeholders. */
         $message = __(
-            'Howdy,
-
-Your site recently crashed and may not be working as expected.
+            'Howdy!
+
+Since WordPress 5.2 there is a built-in feature that detects when a plugin or theme causes a fatal error on your site, and notifies you with this automated email.
 ###CAUSE###
-Please click the link below to initiate recovery mode and fix the problem.
-
-This link expires in ###EXPIRES###.
-
-###LINK### ###DETAILS###
-
---The WordPress Team
-https://wordpress.org/
-'
+First, visit your website (###SITEURL###) and check for any visible issues. Next, visit the page where the error was caught (###PAGEURL###) and check for any visible issues.
+
+###SUPPORT###
+
+If your site appears broken and you can\'t access your dashboard normally, WordPress now has a special "recovery mode". This lets you safely login to your dashboard and investigate further.
+
+###LINK###
+
+To keep your site safe, this link will expire in ###EXPIRES###. Don\'t worry about that, though: a new link will be emailed to you if the error occurs again after it expires.
+
+###DETAILS###'
         );
         $message = str_replace(
@@ -144 +156 @@
                 '###CAUSE###',
                 '###DETAILS###',
+                '###SITEURL###',
+                '###PAGEURL###',
+                '###SUPPORT###',
             ),
             array(
@@ -150 +165 @@
                 $cause ? "\n{$cause}\n" : "\n",
                 $details,
+                home_url( '/' ),
+                home_url( $_SERVER['REQUEST_URI'] ),
+                $support,
             ),
             $message
@@ -225 +243 @@
             } else {
                 foreach ( $plugins as $file => $plugin_data ) {
-                    if ( 0 === strpos( $file, "{$extension['slug']}/" ) ) {
+                    if ( 0 === strpos( $file, "{$extension['slug']}/" ) || $file === $extension['slug'] ) {
                         $name = $plugin_data['Name'];
                         break;
@@ -237 +255 @@
 
             /* translators: %s: plugin name */
-            $cause = sprintf( __( 'This was caused by the following plugin: %s.' ), $name );
+            $cause = sprintf( __( 'In this case, WordPress caught an error with one of your plugins, %s.' ), $name );
         } else {
             $theme = wp_get_theme( $extension['slug'] );
@@ -243 +261 @@
 
             /* translators: %s: theme name */
-            $cause = sprintf( __( 'This was caused by the following theme: %s.' ), $name );
+            $cause = sprintf( __( 'In this case, WordPress caught an error with your theme, %s.' ), $name );
         }