Ticket #12584: 12584.2.patch
File 12584.2.patch, 5.3 KB (added by , 9 years ago) |
---|
-
src/wp-includes/pluggable.php
1457 1457 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 1458 1458 // we want to reverse this for the plain text arena of emails. 1459 1459 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 1460 1460 $comment_content = wp_specialchars_decode( $comment->comment_content ); 1461 1461 1462 switch ( $comment->comment_type ) { 1462 1463 case 'trackback': 1463 1464 $notify_message = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n"; … … 1464 1465 /* translators: 1: website name, 2: website IP, 3: website hostname */ 1465 1466 $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 1466 1467 $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; 1467 $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment ->comment_content ) . "\r\n\r\n";1468 $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n"; 1468 1469 $notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n"; 1469 1470 /* translators: 1: blog name, 2: post title */ 1470 1471 $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title ); … … 1474 1475 /* translators: 1: website name, 2: website IP, 3: website hostname */ 1475 1476 $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 1476 1477 $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; 1477 $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment ->comment_content ) . "\r\n\r\n";1478 $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n"; 1478 1479 $notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n"; 1479 1480 /* translators: 1: blog name, 2: post title */ 1480 1481 $subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title ); … … 1485 1486 $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 1486 1487 $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n"; 1487 1488 $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; 1488 $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment ->comment_content ) . "\r\n\r\n";1489 $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n"; 1489 1490 $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n"; 1490 1491 /* translators: 1: blog name, 2: post title */ 1491 1492 $subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title ); … … 1592 1593 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 1593 1594 // we want to reverse this for the plain text arena of emails. 1594 1595 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 1596 $comment_content = wp_specialchars_decode( $comment->comment_content ); 1595 1597 1596 1598 switch ( $comment->comment_type ) { 1597 1599 case 'trackback': … … 1600 1602 /* translators: 1: website name, 2: website IP, 3: website hostname */ 1601 1603 $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 1602 1604 $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; 1603 $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment ->comment_content . "\r\n\r\n";1605 $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n"; 1604 1606 break; 1605 1607 case 'pingback': 1606 1608 $notify_message = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; … … 1608 1610 /* translators: 1: website name, 2: website IP, 3: website hostname */ 1609 1611 $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 1610 1612 $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; 1611 $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment ->comment_content . "\r\n\r\n";1613 $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n"; 1612 1614 break; 1613 1615 default: // Comments 1614 1616 $notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; … … 1616 1618 $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 1617 1619 $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n"; 1618 1620 $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; 1619 $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment ->comment_content ) . "\r\n\r\n";1621 $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n"; 1620 1622 break; 1621 1623 } 1622 1624