Skip to:
Content

BuddyPress.org

Ticket #7024: 7024.01.patch

File 7024.01.patch, 1.1 KB (added by DJPaul, 4 years ago)
  • src/bp-core/classes/class-bp-email.php

    diff --git a/src/bp-core/classes/class-bp-email.php b/src/bp-core/classes/class-bp-email.php
    index f4de900..3b50be9 100644
    a b class BP_Email { 
    171171                        $domain = 'localhost.localdomain';
    172172                }
    173173
    174                 // This was escaped with esc_html on the way into the database in sanitize_option().
    175                 $from_name    = wp_specialchars_decode( bp_get_option( 'blogname' ), ENT_QUOTES );
    176                 $from_address = "wordpress@$domain";
    177 
    178174                /** This filter is documented in wp-includes/pluggable.php */
    179                 $from_address = apply_filters( 'wp_mail_from', $from_address );
     175                $from_address = apply_filters( 'wp_mail_from', "wordpress@$domain" );
    180176
     177                // This was escaped with esc_html on the way into the database in sanitize_option().
    181178                /** This filter is documented in wp-includes/pluggable.php */
    182                 $from_name = apply_filters( 'wp_mail_from_name', $from_name );
     179                $from_name = wp_specialchars_decode( apply_filters( 'wp_mail_from_name', 'WordPress' ), ENT_QUOTES );
    183180
    184181                $this->set_from( $from_address, $from_name );
    185182                $this->set_reply_to( bp_get_option( 'admin_email' ), $from_name );