Ticket #26268: 26268.10.diff

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

@@ -236 +236 @@
                         } else {
                                 $children = _get_term_hierarchy( $taxonomy );
                         }
+                        // Handle custom display of default category by showing it first in the list
+
+                        if ( 'category' == $taxonomy ) {
+                                $default_category = get_term( get_option( 'default_category' ), 'category' );
+                                $this->single_row( $default_category );
+                        }
+
                         // 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, $terms, $children, $offset, $number, $count );
                 } else {
+                        $terms = get_terms( $taxonomy, $args );
+                        // Handle custom display of default category by showing it first in the list
+
+                        $default_category_id = false;
+                        if ( 'category' == $taxonomy ) {
+                                $default_category = get_term( get_option( 'default_category' ), 'category' );
+                                $this->single_row( $default_category );
+                                $default_category_id = $default_category->term_id;
+                        }
                         foreach ( $terms as $term ) {
+                                if ( $default_category_id == $term->term_taxonomy_id ) {
+                                        continue;
+                                }
                                 $this->single_row( $term );
                         }
                 }
@@ -259 +278 @@
 
                 $end = $start + $per_page;
 
+                // Handle display of default category by showing it first in the list, capture default category id
+
+                $default_category_id = false;
+                if ( 'category' == $taxonomy ) {
+                        $default_category_id = get_option( 'default_category' );
+                }
+
                 foreach ( $terms as $key => $term ) {
 
                         if ( $count >= $end )
@@ -267 +293 @@
                         if ( $term->parent != $parent && empty( $_REQUEST['s'] ) )
                                 continue;
 
+                        // Skip duplicating display of default category
+                        if ( $default_category_id == $term->term_taxonomy_id ) {
+                                continue;
+                        }
+
                         // If the page starts in a subtree, print the parents.
                         if ( $count == $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
                                 $my_parents = $parent_ids = array();
@@ -340 +371 @@
         public function column_name( $tag ) {
                 $taxonomy = $this->screen->taxonomy;
 
+                $default_term = get_option( 'default_' . $taxonomy );
+                $default_term_label = '';
+                if ( $tag->term_id == $default_term ) {
+                        $default_term_label = ' - <span class="taxonomy-label"> ' . __( 'Default' ) . '</span>';
+                }
+
                 $pad = str_repeat( '&#8212; ', max( 0, $this->level ) );
 
                 /**
@@ -360 +397 @@
                 $qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
                 $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type ) );
 
-                $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
+                $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a>' . $default_term_label . '</strong><br />';
 
                 $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
                 $out .= '<div class="name">' . $qe_data->name . '</div>';