From 4182df24f823da08bc86d93ec0e9168b7bf568e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= Date: Tue, 14 Jul 2015 16:18:25 +0000 Subject: [PATCH] List tables: Even more robust fallback for the primary column. Since `WP_List_Table::get_default_primary_column()` can be overridden in a subclass and columns can be further filtered, it is possible to end up with a primary column that no longer exists. This is particularly evident in list tables for custom post types that have been altered via filter. props ocean90. fixes #32996. Built from https://develop.svn.wordpress.org/trunk@33266 git-svn-id: http://core.svn.wordpress.org/trunk@33238 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-list-table.php | 6 ++++++ wp-admin/includes/class-wp-posts-list-table.php | 2 +- wp-includes/version.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index 7188ebc44c..e7a7855e8a 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -887,6 +887,12 @@ class WP_List_Table { $columns = $this->get_columns(); $default = $this->get_default_primary_column_name(); + // If the primary column doesn't exist fall back to the + // first non-checkbox column. + if ( ! isset( $columns[ $default ] ) ) { + $default = WP_List_Table::get_default_primary_column_name(); + } + /** * Filter the name of the primary column for the current list table. * diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index 7c9ae710ef..571ad8a54e 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -1069,7 +1069,7 @@ class WP_Posts_List_Table extends WP_List_Table { * @return string Name of the default primary column, in this case, 'title'. */ protected function get_default_primary_column_name() { - return( 'title' ); + return 'title'; } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 94f80665c2..19882daa62 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-beta2-33265'; +$wp_version = '4.3-beta2-33266'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.