Changeset 34076

Timestamp:

09/12/2015 08:12:43 AM (9 years ago)

Author:

wonderboymusic

Message:

List Tables: don't render "extra tablenav" if there are no posts. This includes Bulk Actions, Dates Dropdown, Category Dropdowns, Pagination.

Also ensure that the Months dropdown, when it is shown, shows months from the proper set of posts.

Props egower, CoenJacobs, MikeHansenMe, mehulkaklotar.
Fixes #33824, #21015, #21856.

File:

• trunk/src/wp-admin/includes/class-wp-list-table.php (modified) (3 diffs)

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

@@ -529 +529 @@
         }
 
+        $extra_checks = "AND post_status != 'auto-draft'";
+        if ( ! isset( $_GET['post_status'] ) || 'trash' !== $_GET['post_status'] ) {
+            $extra_checks .= " AND post_status != 'trash'";
+        } elseif ( isset( $_GET['post_status'] ) ) {
+            $stati = explode( ',', $_GET['post_status'] );
+            $extra_checks = '';
+            foreach ( $stati as $status ) {
+                $extra_checks .= $wpdb->prepare( ' AND post_status = %s', $status );
+            }
+        }
+
         $months = $wpdb->get_results( $wpdb->prepare( "
             SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
             FROM $wpdb->posts
             WHERE post_type = %s
+            $extra_checks
             ORDER BY post_date DESC
         ", $post_type ) );
@@ -1119 +1131 @@
         if ( 'top' == $which )
             wp_nonce_field( 'bulk-' . $this->_args['plural'] );
-?>
+
+        if ( $this->has_items() ) : ?>
     <div class="tablenav <?php echo esc_attr( $which ); ?>">
 
@@ -1133 +1146 @@
     </div>
 <?php
+        endif;
     }