From dd6fe5b61e5fa2180051e7748514ff968cbc9f10 Mon Sep 17 00:00:00 2001 From: Christoph Herbst Date: Wed, 28 Feb 2018 13:26:21 +0100 Subject: [PATCH] use wpautop instead of nl2br in email content --- bp-core/bp-core-filters.php | 2 +- bp-core/classes/class-bp-email.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bp-core/bp-core-filters.php b/bp-core/bp-core-filters.php index 8d3be6e..fb43c32 100644 --- a/bp-core/bp-core-filters.php +++ b/bp-core/bp-core-filters.php @@ -1132,7 +1132,7 @@ function bp_core_render_email_template( $template ) { // Make sure we add a tag so WP Customizer picks it up. $template = str_replace( '<head>', '<head><title>' . esc_html_x( 'BuddyPress Emails', 'screen heading', 'buddypress' ) . '', $template ); - echo str_replace( '{{{content}}}', nl2br( get_post()->post_content ), $template ); + echo str_replace( '{{{content}}}', wpautop( get_post()->post_content ), $template ); /* * Link colours are applied directly in the email template before sending, so we diff --git a/bp-core/classes/class-bp-email.php b/bp-core/classes/class-bp-email.php index f4de900..19c22c6 100644 --- a/bp-core/classes/class-bp-email.php +++ b/bp-core/classes/class-bp-email.php @@ -246,7 +246,7 @@ class BP_Email { switch ( $transform ) { // Special-case to fill the $template with the email $content. case 'add-content': - $retval = str_replace( '{{{content}}}', nl2br( $this->get_content( 'replace-tokens' ) ), $retval ); + $retval = str_replace( '{{{content}}}', wpautop( $this->get_content( 'replace-tokens' ) ), $retval ); // Fall through. case 'replace-tokens': -- 2.14.1