Changeset 17002 for trunk/wp-admin/includes/class-wp-list-table.php

Timestamp:

12/16/2010 07:05:14 PM (15 years ago)

Author:

scribu

Message:

Always display the table, with a placeholder row when there are no items. Fixes #15849

File:

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

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

@@ -648 +648 @@
 
     /**
-     * Display the table or a message if there are no items
+     * Display the table
      *
      * @since 3.1.0
@@ -654 +654 @@
      */
     function display() {
-        if ( $this->has_items() ) {
-            $this->display_table();
-        } else {
-?>
-        <br class="clear" />
-        <p><?php $this->no_items(); ?></p>
-<?php
-        }
-    }
-
-    /**
-     * Get a list of CSS classes for the <table> tag
-     *
-     * @since 3.1.0
-     * @access protected
-     *
-     * @return array
-     */
-    function get_table_classes() {
-        return array( 'widefat', 'fixed', $this->_args['plural'] );
-    }
-
-    /**
-     * Display the full table
-     *
-     * @since 3.1.0
-     * @access public
-     */
-    function display_table() {
         extract( $this->_args );
 
@@ -702 +673 @@
 
     <tbody id="the-list"<?php if ( $singular ) echo " class='list:$singular'"; ?>>
-        <?php $this->display_rows(); ?>
+        <?php $this->display_rows_or_placeholder(); ?>
     </tbody>
 </table>
 <?php
-
         $this->display_tablenav( 'bottom' );
+    }
+
+    /**
+     * Get a list of CSS classes for the <table> tag
+     *
+     * @since 3.1.0
+     * @access protected
+     *
+     * @return array
+     */
+    function get_table_classes() {
+        return array( 'widefat', 'fixed', $this->_args['plural'] );
     }
 
@@ -746 +728 @@
     /**
      * Generate the <tbody> part of the table
+     *
+     * @since 3.1.0
+     * @access protected
+     */
+    function display_rows_or_placeholder() {
+        if ( $this->has_items() ) {
+            $this->display_rows();
+        } else {
+            echo '<tr class="no-items"><td colspan="2">';
+            $this->no_items();
+            echo '</td></tr>';
+        }
+    }
+
+    /**
+     * Generate the table rows
      *
      * @since 3.1.0
@@ -823 +821 @@
 
         ob_start();
-        $this->display_rows();
+        $this->display_rows_or_placeholder();
         $rows = ob_get_clean();