diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php index 525c83d1f4..02b4379526 100644 --- a/src/wp-admin/options-discussion.php +++ b/src/wp-admin/options-discussion.php @@ -158,7 +158,7 @@ printf( __('Comments should be displayed with the %s comments at the top of each
-

+

diff --git a/src/wp-includes/comment-functions.php b/src/wp-includes/comment-functions.php index 453b5a8107..fd6803a745 100644 --- a/src/wp-includes/comment-functions.php +++ b/src/wp-includes/comment-functions.php @@ -673,7 +673,7 @@ function wp_allow_comment( $commentdata ) { $commentdata['comment_author_IP'], $commentdata['comment_agent'] ) ) { - $approved = 'spam'; + $approved = EMPTY_TRASH_DAYS ? 'trash' : 'spam'; } }