Changeset 53063

Timestamp:

04/04/2022 08:19:12 PM (4 years ago)

Author:

audrasjb

Message:

Mail: Replace empty site title with domain name in email subjects.

This change replaces site title with domain name in email subjects when the blogname option is empty.

Props Presskopp, kebbet, audrasjb, azouamauriac.
Fixes #54760.

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-automatic-updater.php (modified) (2 diffs)
• includes/misc.php (modified) (2 diffs)
• includes/user.php (modified) (2 diffs)
• user-new.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -1237 +1237 @@
                 $body[] = "\n" . __( 'The WordPress Team' );
 
+                if ( '' !== get_option( 'blogname' ) ) {
+                        $site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+                } else {
+                        $site_title = parse_url( home_url(), PHP_URL_HOST );
+                }
+
                 $body    = implode( "\n", $body );
                 $to      = get_site_option( 'admin_email' );
-                $subject = sprintf( $subject, wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) );
+                $subject = sprintf( $subject, $site_title );
                 $headers = '';
 
@@ -1348 +1354 @@
                 }
 
-                $site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+                if ( '' !== get_bloginfo( 'name' ) ) {
+                        $site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+                } else {
+                        $site_title = parse_url( home_url(), PHP_URL_HOST );
+                }
 
                 if ( $failures ) {

trunk/src/wp-admin/includes/misc.php

@@ -1473 +1473 @@
         $content      = str_replace( '###SITEURL###', home_url(), $content );
 
+        if ( '' !== get_option( 'blogname' ) ) {
+                $site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+        } else {
+                $site_title = parse_url( home_url(), PHP_URL_HOST );
+        }
+
         wp_mail(
                 $value,
@@ -1478 +1484 @@
                         /* translators: New admin email address notification email subject. %s: Site title. */
                         __( '[%s] New Admin Email Address' ),
-                        wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )
+                        $site_title
                 ),
                 $content

trunk/src/wp-admin/includes/user.php

@@ -579 +579 @@
         $role  = $roles[ $_REQUEST['role'] ];
 
+        if ( '' !== get_bloginfo( 'name' ) ) {
+                $site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+        } else {
+                $site_title = parse_url( home_url(), PHP_URL_HOST );
+        }
+
         return sprintf(
                 /* translators: 1: Site title, 2: Site URL, 3: User role. */
@@ -591 +597 @@
 %%s'
                 ),
-                wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ),
+                $site_title,
                 home_url(),
                 wp_specialchars_decode( translate_user_role( $role['name'] ) )

trunk/src/wp-admin/user-new.php

@@ -113 +113 @@
                         $switched_locale = switch_to_locale( get_user_locale( $user_details ) );
 
+                        if ( '' !== get_option( 'blogname' ) ) {
+                                $site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+                        } else {
+                                $site_title = parse_url( home_url(), PHP_URL_HOST );
+                        }
+
                         /* translators: 1: Site title, 2: Site URL, 3: User role, 4: Activation URL. */
                         $message = __(
@@ -128 +134 @@
                                 /* translators: Joining confirmation notification email subject. %s: Site title. */
                                 __( '[%s] Joining Confirmation' ),
-                                wp_specialchars_decode( get_option( 'blogname' ) )
+                                $site_title
                         );
                         $new_user_email['message'] = sprintf(