Changeset 28134

Timestamp:

04/15/2014 08:51:23 AM (11 years ago)

Author:

nacin

Message:

Allow the API to add text to auto update emails.

fixes #27812.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-includes/update.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -2366 +2366 @@
         }
 
+        $critical_support = 'critical' === $type && ! empty( $core_update->support_email );
+        if ( $critical_support ) {
+            // Support offer if available.
+            $body .= "\n\n" . sprintf( __( "The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working." ), $core_update->support_email );
+        } else {
+            // Add a note about the support forums.
+            $body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
+            $body .= "\n" . __( 'https://wordpress.org/support/' );
+        }
+
         // Updates are important!
-        if ( $type != 'success' || $newer_version_available )
+        if ( $type != 'success' || $newer_version_available ) {
             $body .= "\n\n" . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' );
-
-        // Add a note about the support forums to all emails.
-        $body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
-        $body .= "\n" . __( 'https://wordpress.org/support/' );
+        }
+
+        if ( $critical_support ) {
+            $body .= " " . __( "If you reach out to us, we'll also ensure you'll never have this problem again." );
+        }
 
         // If things are successful and we're now on the latest, mention plugins and themes if any are out of date.

trunk/src/wp-includes/update.php

@@ -143 +143 @@
         }
         $offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale',
-            'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email' ), '' ) );
+            'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email' ), '' ) );
     }