Apply suggestions from code review

Co-authored-by: Weston Ruter <[email protected]>

Author: kraftbj

src/wp-admin/edit-tags.php

@@ -634,7 +634,7 @@
 		/** This filter is documented in wp-includes/category-template.php */
 		'<strong>' . apply_filters( 'the_category', get_cat_name( $default_category_id ), '', '' ) . '</strong>',
 		esc_url( get_edit_term_link( $default_category_id, 'category' ) ),
-		esc_url( admin_url( 'options-writing.php#default-category-row' ) )
+		esc_url( admin_url( 'options-writing.php#default_category' ) )
 	);
 	?>
 </p>

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

@@ -243,14 +243,11 @@ public function display_rows_or_placeholder() {
 		}
 
 		// Handle custom display of default category by showing it first in the list.
-		$default_category    = false;
-		$default_category_id = 0;
+		$default_category = null;
 		if ( 'category' === $taxonomy ) {
-			$default_category_id = (int) get_option( 'default_category' );
-			$default_category    = get_term( $default_category_id, 'category' );
-			if ( ! $default_category || is_wp_error( $default_category ) ) {
-				$default_category    = false;
-				$default_category_id = 0;
+			$default_category = get_term( (int) get_option( 'default_category' ), 'category' );
+			if ( ! ( $default_category instanceof WP_Term ) ) {
+				$default_category = null;
 			}
 		}
 
@@ -270,15 +267,15 @@ public function display_rows_or_placeholder() {
 			 * Some funky recursion to get the job done (paging & parents mainly) is contained within.
 			 * Skip it for non-hierarchical taxonomies for performance sake.
 			 */
-			$this->_rows( $taxonomy, $this->items, $children, $offset, $number, $count, 0, 0, $default_category_id );
+			$this->_rows( $taxonomy, $this->items, $children, $offset, $number, $count, 0, 0, $default_category->term_id );
 		} else {
 			// Only show pinned default category on the first page.
 			if ( $default_category && 0 === $offset ) {
 				$this->single_row( $default_category );
 			}
 
 			foreach ( $this->items as $term ) {
-				if ( $default_category_id && $default_category_id === $term->term_id ) {
+				if ( $default_category && $default_category->term_id === $term->term_id ) {
 					continue;
 				}
 				$this->single_row( $term );
@@ -573,7 +570,7 @@ protected function handle_row_actions( $item, $column_name, $primary ) {
 		if ( 'category' === $taxonomy && (int) get_option( 'default_category' ) === $tag->term_id ) {
 			$actions['change-default'] = sprintf(
 				'<a href="%s">%s</a>',
-				admin_url( 'options-writing.php#default-category-row' ),
+				admin_url( 'options-writing.php#default_category' ),
 				__( 'Change Default' )
 			);
 		}

src/wp-admin/options-writing.php

@@ -78,7 +78,7 @@
 </fieldset></td>
 </tr>
 <?php endif; ?>
-<tr id="default-category-row">
+<tr>
 <th scope="row"><label for="default_category"><?php _e( 'Default Post Category' ); ?></label></th>
 <td>
 <?php