Ticket #26268: 26268.diff

src/wp-admin/edit-tags.php

@@ -65 +65 @@
         exit;
 break;
 
+case 'default':
+        if ( !current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'Cheatin’ uh?' ) );
+        }
+        
+        $location = 'edit-tags.php?taxonomy=' . $taxonomy;
+
+        if ( !isset( $_REQUEST['tag_ID'] ) ) {
+                wp_redirect( $location );
+                exit;
+        }
+        
+        $tag_ID = (int) $_REQUEST['tag_ID'];
+
+        if ( !term_exists( $tag_ID, $taxonomy ) ) {
+                wp_redirect( $location );
+                exit;
+        }
+        
+        update_option( 'default_' . $taxonomy,  $tag_ID );
+
+        wp_redirect( $location );
+        exit;
+
+break;
+
 case 'delete':
         $location = 'edit-tags.php?taxonomy=' . $taxonomy;
         if ( 'post' != $post_type )

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

@@ -268 +268 @@
 
                 $default_term = get_option( 'default_' . $taxonomy );
 
+                $default_term_label = '';
+                if ( $tag->term_id == $default_term ) {
+                        $default_term_label = ' - <span class="taxonomy-label"> ' . __( 'Default' ) . '</span>';
+                }
+                $default_link_args = array(
+                        'action' => 'default',
+                        'taxonomy' => $taxonomy,
+                        'tag_ID' => $tag->term_id,
+                        );
+                $default_link = esc_url( add_query_arg( $default_link_args, admin_url( 'edit-tags.php' ) ) );
+
                 $pad = str_repeat( '&#8212; ', max( 0, $this->level ) );
 
                 /**
@@ -288 +299 @@
                 $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 />';
 
                 $actions = array();
                 if ( current_user_can( $tax->cap->edit_terms ) ) {
                         $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
                         $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
                 }
+                if ( current_user_can( 'manage_options' ) && $tag->term_id != $default_term && 'category' == $this->screen->taxonomy ) {
+                        $actions['default'] = '<a href="' . $default_link . '">' . __( 'Set as Default' ) . '</a>';
+                }
                 if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
                         $actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
                 if ( $tax->public )

src/wp-admin/options-writing.php

@@ -77 +77 @@
 <label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_option('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
 </fieldset></td>
 </tr>
-<tr>
-<th scope="row"><label for="default_category"><?php _e('Default Post Category') ?></label></th>
-<td>
 <?php
-wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_category', 'orderby' => 'name', 'selected' => get_option('default_category'), 'hierarchical' => true));
-?>
-</td>
-</tr>
-<?php
 $post_formats = get_post_format_strings();
 unset( $post_formats['standard'] );
 ?>