From e8040ea42d080345d4dc36b8d0e541991ea068b4 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 20 Jan 2011 22:19:34 +0000
Subject: [PATCH] Properly account for columns shown in the list table
 display_rows_or_placeholder methods. props garyc40, fixes #16279.

git-svn-id: https://develop.svn.wordpress.org/trunk@17339 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/class-wp-list-table.php       | 3 ++-
 wp-admin/includes/class-wp-terms-list-table.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php
index 13a688cc91..5a783e38fb 100644
--- a/wp-admin/includes/class-wp-list-table.php
+++ b/wp-admin/includes/class-wp-list-table.php
@@ -771,7 +771,8 @@ class WP_List_Table {
 		if ( $this->has_items() ) {
 			$this->display_rows();
 		} else {
-			echo '<tr class="no-items"><td colspan="2">';
+			list( $columns, $hidden ) = $this->get_column_info();
+			echo '<tr class="no-items"><td class="colspanchange" colspan="' . ( count( $columns ) - count( array_filter( $hidden ) ) ) . '">';
 			$this->no_items();
 			echo '</td></tr>';
 		}
diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php
index b17e96dc45..14443bf6ac 100644
--- a/wp-admin/includes/class-wp-terms-list-table.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -163,7 +163,8 @@ class WP_Terms_List_Table extends WP_List_Table {
 		}
 
 		if ( empty( $terms ) ) {
-			echo '<tr class="no-items"><td colspan="2">';
+			list( $columns, $hidden ) = $this->get_column_info();
+			echo '<tr class="no-items"><td class="colspanchange" colspan="' . ( count( $columns ) - count( array_filter( $hidden ) ) ) . '">';
 			$this->no_items();
 			echo '</td></tr>';
 		} else {