← Back to branch summary

~canonical-sysadmins/wordpress/4.9

« back to all changes in this revision

Viewing changes to wp-admin/includes/class-wp-comments-list-table.php

  • Committer: Barry Price
  • Date: 2017-06-09 02:09:58 UTC
  • mfrom: (1.1.26 upstream)
  • Revision ID: barry.price@canonical.com-20170609020958-838whhwt2196f2vk
Merge WP4.8 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/class-wp-comments-list-table.php
354
354
                        submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
355
355
                }
356
356
 
357
 
                if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) ) {
 
357
                if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $this->has_items() ) {
358
358
                        wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
359
359
                        $title = ( 'spam' === $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
360
360
                        submit_button( $title, 'apply', 'delete_all', false );
690
690
 
691
691
                if ( $this->user_can ) {
692
692
                        if ( ! empty( $comment->comment_author_email ) ) {
693
 
                                /* This filter is documented in wp-includes/comment-template.php */
 
693
                                /** This filter is documented in wp-includes/comment-template.php */
694
694
                                $email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
695
695
 
696
696
                                if ( ! empty( $email ) && '@' !== $email ) {