diff --git a/src/wp-admin/includes/class-wp-ms-themes-list-table.php b/src/wp-admin/includes/class-wp-ms-themes-list-table.php index 5146e18a14..5852ee055a 100644 --- a/src/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/src/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -438,24 +438,17 @@ class WP_MS_Themes_List_Table extends WP_List_Table { if ( in_array( $column_name, $hidden ) ) $style = ' style="display:none;"'; - $extra_class = ''; - if ( $primary === $column_name ) { - $extra_class = ' column-primary'; - } - switch ( $column_name ) { case 'cb': echo "$checkbox"; break; case 'name': - echo "" . $theme->display('Name') . ""; - if ( $primary === $column_name ) { - echo $this->row_actions($actions, true); - } + echo "" . $theme->display('Name') . ""; + echo $this->row_actions($actions, true); echo ""; break; case 'description': - echo ""; + echo ""; if ( $theme->errors() ) { $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : ''; echo '

' . $pre . $theme->errors()->get_error_message() . '

'; @@ -490,14 +483,11 @@ class WP_MS_Themes_List_Table extends WP_List_Table { echo implode( ' | ', $theme_meta ); echo ''; - if ( $primary === $column_name ) { - echo $this->row_actions($actions, true); - } echo ''; break; default: - echo ""; + echo ""; /** * Fires inside each custom column of the Multisite themes list table. @@ -510,9 +500,6 @@ class WP_MS_Themes_List_Table extends WP_List_Table { */ do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme ); - if ( $primary === $column_name ) { - echo $this->row_actions($actions, true); - } echo ""; } } diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php index 1de524c2d6..f80db42312 100644 --- a/src/wp-admin/includes/class-wp-plugins-list-table.php +++ b/src/wp-admin/includes/class-wp-plugins-list-table.php @@ -581,8 +581,6 @@ class WP_Plugins_List_Table extends WP_List_Table { list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info(); - $extra_class = ' column-primary'; - foreach ( $columns as $column_name => $column_display_name ) { $style = ''; if ( in_array( $column_name, $hidden ) ) { @@ -594,19 +592,12 @@ class WP_Plugins_List_Table extends WP_List_Table { echo "$checkbox"; break; case 'name': - if ( $primary === $column_name || ! isset( $columns[ $primary ] ) ) { - echo "$plugin_name"; - echo $this->row_actions( $actions, true ); - } else { - echo "$plugin_name"; - } + echo "$plugin_name"; + echo $this->row_actions( $actions, true ); echo ""; break; case 'description': $classes = 'column-description desc'; - if ( $primary === $column_name ) { - $classes .= " $extra_class"; - } echo "
$description
@@ -655,16 +646,10 @@ class WP_Plugins_List_Table extends WP_List_Table { $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status ); echo implode( ' | ', $plugin_meta ); - if ( $primary === $column_name ) { - echo $this->row_actions( $actions, true ); - } echo ""; break; default: $classes = "$column_name column-$column_name$class"; - if ( $primary === $column_name ) { - $classes .= " $extra_class"; - } echo ""; @@ -679,9 +664,6 @@ class WP_Plugins_List_Table extends WP_List_Table { */ do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data ); - if ( $primary === $column_name ) { - echo $this->row_actions( $actions, true ); - } echo ""; } } @@ -724,9 +706,9 @@ class WP_Plugins_List_Table extends WP_List_Table { * @since 4.3.0 * @access protected * - * @return string Unalterable name for the primary column, in this case, 'plugin'. + * @return string Unalterable name for the primary column, in this case, 'name'. */ protected function get_primary_column_name() { - return 'plugin'; + return 'name'; } }