Ticket #7024: 7024.02.patch

src/bp-core/bp-core-filters.php

@@ -243 +243 @@
 add_filter( 'nav_menu_css_class', 'bp_core_menu_highlight_nav_menu_item', 10, 2 );
 
 /**
+ * Set "From" name in outgoing email to the site name.
+ *
+ * @since 1.0.0
+ *
+ * @return string The blog name for the root blog.
+ */
+function bp_core_email_from_name_filter() {
+        _deprecated_function( __FUNCTION__, '2.5' );
+
+        /**
+         * Filters the "From" name in outgoing email to the site name.
+         *
+         * @since 1.2.0
+         *
+         * @param string $value Value to set the "From" name to.
+         */
+        return apply_filters( 'bp_core_email_from_name_filter', bp_get_option( 'blogname', 'WordPress' ) );
+}
+add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
+
+/**
  * Filter the blog post comments array and insert BuddyPress URLs for users.
  *
  * @since 1.2.0

src/bp-core/classes/class-bp-email.php

@@ -171 +171 @@
                         $domain = 'localhost.localdomain';
                 }
 
-                // This was escaped with esc_html on the way into the database in sanitize_option().
-                $from_name    = wp_specialchars_decode( bp_get_option( 'blogname' ), ENT_QUOTES );
-                $from_address = "wordpress@$domain";
-
                 /** This filter is documented in wp-includes/pluggable.php */
-                $from_address = apply_filters( 'wp_mail_from', $from_address );
+                $from_address = apply_filters( 'wp_mail_from', "wordpress@$domain" );
 
+                // This was escaped with esc_html on the way into the database in sanitize_option().
                 /** This filter is documented in wp-includes/pluggable.php */
-                $from_name = apply_filters( 'wp_mail_from_name', $from_name );
+                $from_name = wp_specialchars_decode( apply_filters( 'wp_mail_from_name', 'WordPress' ), ENT_QUOTES );
 
                 $this->set_from( $from_address, $from_name );
                 $this->set_reply_to( bp_get_option( 'admin_email' ), $from_name );

src/bp-core/deprecated/2.5.php

@@ -9 +9 @@
 defined( 'ABSPATH' ) || exit;
 
 /**
- * Set "From" name in outgoing email to the site name.
- *
- * @since 1.0.0
- * @deprecated 2.5.0 Not used. Was hooked to WordPress' "wp_mail_from_name" action.
- *                   Use the "bp_email_get_from" action instead.
- *
- * @return string The blog name for the root blog.
- */
-function bp_core_email_from_name_filter() {
-        _deprecated_function( __FUNCTION__, '2.5' );
-
-        /**
-         * Filters the "From" name in outgoing email to the site name.
-         *
-         * @since 1.2.0
-         * @deprecated 2.5.0 Not used.
-         *
-         * @param string $value Value to set the "From" name to.
-         */
-        return apply_filters( 'bp_core_email_from_name_filter', bp_get_option( 'blogname', 'WordPress' ) );
-}
-
-/**
  * Add support for pre-2.5 email filters.
  *
  * @since 2.5.0