Merge pull request #4761 from claudiosmweb/removed_not_useful_nl2br_in_plans_emails
Removed nl2br which is not useful in plain email templates
This commit is contained in:
commit
55b21bd07d
|
@ -4,10 +4,12 @@
|
|||
*
|
||||
* @author WooThemes
|
||||
* @package WooCommerce/Templates/Emails/Plain
|
||||
* @version 2.1.0
|
||||
* @version 2.1.2
|
||||
*/
|
||||
|
||||
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
|
||||
if ( ! defined( 'ABSPATH' ) ) {
|
||||
exit; // Exit if accessed directly
|
||||
}
|
||||
|
||||
global $woocommerce;
|
||||
|
||||
|
@ -19,11 +21,12 @@ foreach ( $items as $item ) :
|
|||
echo apply_filters( 'woocommerce_order_item_name', $item['name'], $item );
|
||||
|
||||
// SKU
|
||||
if ( $show_sku && $_product->get_sku() )
|
||||
if ( $show_sku && $_product->get_sku() ) {
|
||||
echo ' (#' . $_product->get_sku() . ')';
|
||||
}
|
||||
|
||||
// Variation
|
||||
echo $item_meta->meta ? "\n" . nl2br( $item_meta->display( true, true ) ) : '';
|
||||
echo $item_meta->meta ? "\n" . $item_meta->display( true, true ) : '';
|
||||
|
||||
// Quantity
|
||||
echo "\n" . sprintf( __( 'Quantity: %s', 'woocommerce' ), $item['qty'] );
|
||||
|
@ -32,7 +35,7 @@ foreach ( $items as $item ) :
|
|||
echo "\n" . sprintf( __( 'Cost: %s', 'woocommerce' ), $order->get_formatted_line_subtotal( $item ) );
|
||||
|
||||
// Download URLs
|
||||
if ( $show_download_links && $_product->exists() && $_product->is_downloadable() ) {
|
||||
if ( $show_download_links && $_product->exists() && $_product->is_downloadable() ) {
|
||||
$download_files = $order->get_item_downloads( $item );
|
||||
$i = 0;
|
||||
|
||||
|
@ -41,17 +44,19 @@ foreach ( $items as $item ) :
|
|||
|
||||
if ( count( $download_files ) > 1 ) {
|
||||
$prefix = sprintf( __( 'Download %d', 'woocommerce' ), $i );
|
||||
} elseif ( $i == 1 )
|
||||
} elseif ( $i == 1 ) {
|
||||
$prefix = __( 'Download', 'woocommerce' );
|
||||
}
|
||||
|
||||
echo "\n" . $prefix . '(' . esc_html( $file['name'] ) . '): ' . esc_url( $file['download_url'] );
|
||||
}
|
||||
}
|
||||
|
||||
// Note
|
||||
if ( $show_purchase_note && $purchase_note = get_post_meta( $_product->id, '_purchase_note', true ) )
|
||||
echo "\n" . nl2br( $purchase_note );
|
||||
if ( $show_purchase_note && $purchase_note = get_post_meta( $_product->id, '_purchase_note', true ) ) {
|
||||
echo "\n" . $purchase_note;
|
||||
}
|
||||
|
||||
echo "\n\n";
|
||||
|
||||
endforeach;
|
||||
endforeach;
|
||||
|
|
Loading…
Reference in New Issue