Ticket #40188: 40188.7.patch

src/wp-admin/includes/class-wp-comments-list-table.php

@@ -323 +323 @@
                 if ( ! isset( $has_items ) ) {
                         $has_items = $this->has_items();
                 }
-?>
-                <div class="alignleft actions">
-<?php
+                echo '<div class="alignleft actions">';
+
                 if ( 'top' === $which ) {
-?>
-                        <label class="screen-reader-text" for="filter-by-comment-type"><?php _e( 'Filter by comment type' ); ?></label>
-                        <select id="filter-by-comment-type" name="comment_type">
-                                <option value=""><?php _e( 'All comment types' ); ?></option>
-<?php
-                                /**
-                                 * Filters the comment types dropdown menu.
-                                 *
-                                 * @since 2.7.0
-                                 *
-                                 * @param array $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
-                                 */
-                                $comment_types = apply_filters( 'admin_comment_types_dropdown', array(
-                                        'comment' => __( 'Comments' ),
-                                        'pings' => __( 'Pings' ),
-                                ) );
-
-                                foreach ( $comment_types as $type => $label )
-                                        echo "\t" . '<option value="' . esc_attr( $type ) . '"' . selected( $comment_type, $type, false ) . ">$label</option>\n";
-                        ?>
-                        </select>
-<?php
+
+                        ob_start();
+
+                        $this->comment_status_dropdown( $comment_type );
+
                         /**
                          * Fires just before the Filter submit button for comment types.
                          *
                          * @since 3.5.0
                          */
                         do_action( 'restrict_manage_comments' );
-                        submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
-                }
+
+                        $output = ob_get_clean();
+
+                        if( ! empty( $output ) && $this->has_items() ) {
+                                echo $output;
+                                submit_button( esc_html__( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+                        }
+                }
 
                 if ( ( 'spam' === $comment_status || 'trash' === $comment_status ) && current_user_can( 'moderate_comments' ) && $has_items ) {
                         wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
@@ -375 +363 @@
         }
 
         /**
+         * Displays a comment status drop-down for filtering on the Comments list table.
+         *
+         * @since 4.9.0
+         *
+         * @param string $comment_type The current comment type slug.
+         */        
+        protected function comment_status_dropdown( $comment_type ) {
+
+                /**
+                 * Filters the comment types dropdown menu.
+                 *
+                 * @since 2.7.0
+                 *
+                 * @param array $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
+                 */                
+                $comment_types = apply_filters( 'admin_comment_types_dropdown', array(
+                        'comment' => esc_html__( 'Comments' ),
+                        'pings'   => esc_html__( 'Pings' ),
+                ) );
+                
+                if( $comment_types && is_array( $comment_types ) ) {
+
+                        printf(
+                                '<label class="screen-reader-text" for="filter-by-comment-type">%s</label>',
+                                esc_html__( 'Filter by comment type' )
+                        );
+
+                        echo '<select id="filter-by-comment-type" name="comment_type">';
+
+                        printf(
+                                "\t<option value=''>%s</option>",
+                                esc_html__( 'All comment types' )
+                        );
+
+                        foreach ( $comment_types as $type => $label ) {
+                                if( get_comments( array( 'number' => 1, 'type' => $type ) ) ) {
+                                        printf (
+                                                "\t<option value='%s'%s>%s</option>\n",
+                                                esc_attr( $type ),
+                                                selected( $comment_type, $type, false ),
+                                                esc_html( $label )
+                                        );
+                                }
+                        }
+
+                        echo '</select>';
+                }
+        }
+
+        /**
          * @return string|false
          */
         public function current_action() {

tests/phpunit/tests/admin/includesListTable.php

@@ -262 +262 @@
 
                 $this->assertNotContains( 'id="delete_all"', $output );
         }
+
+        /**
+         * @ticket 40188
+         */
+        public function test_filter_button_should_not_be_shown_if_there_are_no_comments() {
+                $table = _get_list_table( 'WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+
+                ob_start();
+                $table->extra_tablenav( 'top' );
+                $output = ob_get_clean();
+
+                $this->assertNotContains( 'id="post-query-submit"', $output );
+        }
+
+        /**
+         * @ticket 40188
+         */
+        public function test_filter_button_should_be_shown_if_there_are_comments() {
+
+                $post_id    = self::factory()->post->create(); 
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id, 'comment_approved' => '1' ) ); 
+
+                $table = _get_list_table( 'WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+                $table->prepare_items();
+
+                ob_start();
+                $table->extra_tablenav( 'top' );
+                $output = ob_get_clean();
+
+                $this->assertContains( 'id="post-query-submit"', $output );
+        }
+
+        /**
+         * @ticket 40188
+         */
+        public function test_filter_comment_status_dropdown_should_be_shown_if_there_are_comments() {
+
+                $post_id    = self::factory()->post->create(); 
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id, 'comment_approved' => '1' ) ); 
+
+                $table = _get_list_table( 'WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+                $table->prepare_items();
+
+                ob_start();
+                $table->extra_tablenav( 'top' );
+                $output = ob_get_clean();
+
+                $this->assertContains( 'id="filter-by-comment-type"', $output );
+                $this->assertContains( "<option value='comment'>", $output );
+        }
 }