Ticket #32642: 32642.diff

wp-admin/edit-tag-form.php

@@ -86 +86 @@
                         <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
                         <p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
                 </tr>
-<?php if ( !global_terms_enabled() ) { ?>
+<?php if ( ! global_terms_enabled() && in_array( 'slug', $tax->supports ) ) { ?>
                 <tr class="form-field term-slug-wrap">
                         <th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
                         <?php
@@ -133 +133 @@
                         </td>
                 </tr>
 <?php endif; // is_taxonomy_hierarchical() ?>
+<?php if ( in_array( 'description', $tax->supports ) ) { ?>
                 <tr class="form-field term-description-wrap">
                         <th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th>
                         <td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea>
                         <p class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p></td>
                 </tr>
+<?php } ?>
                 <?php
                 // Back compat hooks
                 if ( 'category' == $taxonomy ) {

wp-admin/edit-tags.php

@@ -217 +217 @@
                 $help .= '<ul>' .
                 '<li>' . __( '<strong>Name</strong> - The name is how it appears on your site.' ) . '</li>';
 
-                if ( ! global_terms_enabled() )
+                if ( ! global_terms_enabled() && in_array( 'slug', $tax->supports ) ) {
                         $help .= '<li>' . __( '<strong>Slug</strong> - The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+                }
 
-                if ( 'category' == $taxonomy )
+                if ( 'category' == $taxonomy ) {
                         $help .= '<li>' . __( '<strong>Parent</strong> - Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+                }
+                        
+                if ( in_array( 'description', $tax->supports ) ) {
+                        $help .= '<li>' . __( '<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.' ) . '</li>';
+                }
 
-                $help .= '<li>' . __( '<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
-                '</ul>' .
+                $help .= '</ul>' .
                 '<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>';
 
                 get_current_screen()->add_help_tab( array(
@@ -461 +466 @@
         <input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
         <p><?php _e('The name is how it appears on your site.'); ?></p>
 </div>
-<?php if ( ! global_terms_enabled() ) : ?>
+<?php if ( ! global_terms_enabled() && in_array( 'slug', $tax->supports ) ) : ?>
 <div class="form-field term-slug-wrap">
         <label for="tag-slug"><?php _e( 'Slug' ); ?></label>
         <input name="slug" id="tag-slug" type="text" value="" size="40" />
@@ -512 +517 @@
         <?php endif; ?>
 </div>
 <?php endif; // is_taxonomy_hierarchical() ?>
-<div class="form-field term-description-wrap">
-        <label for="tag-description"><?php _e( 'Description' ); ?></label>
-        <textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
-        <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
-</div>
+
+<?php if ( in_array( 'description', $tax->supports ) ) { ?>
+        <div class="form-field term-description-wrap">
+                <label for="tag-description"><?php _e( 'Description' ); ?></label>
+                <textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
+                <p><?php _e( 'The description is not prominent by default; however, some themes may show it.' ); ?></p>
+        </div>
+<?php } ?>
 
 <?php
 if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {

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

@@ -164 +164 @@
          * @return array
          */
         public function get_columns() {
+                $taxonomy = $this->screen->taxonomy;
+                $tax      = get_taxonomy( $taxonomy );
+
                 $columns = array(
                         'cb'          => '<input type="checkbox" />',
                         'name'        => _x( 'Name', 'term name' ),
                         'description' => __( 'Description' ),
                         'slug'        => __( 'Slug' ),
                 );
+                foreach ( $columns as $key => $value ) {
+                        if ( ! in_array( $key, $tax->supports ) && in_array( $key, [ 'slug', 'description' ] ) ) {
+                                unset( $columns[ $key ] );      
+                        }
+                }
 
-                if ( 'link_category' == $this->screen->taxonomy ) {
+                if ( 'link_category' == $taxonomy ) {
                         $columns['links'] = __( 'Links' );
                 } else {
                         $columns['posts'] = _x( 'Count', 'Number/count of items' );
@@ -541 +549 @@
                                         <span class="title"><?php _ex( 'Name', 'term name' ); ?></span>
                                         <span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
                                 </label>
-        <?php if ( !global_terms_enabled() ) { ?>
+                        <?php if ( ! global_terms_enabled() && in_array( 'slug', $tax->supports ) ) { ?>
                                 <label>
                                         <span class="title"><?php _e( 'Slug' ); ?></span>
                                         <span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
                                 </label>
-        <?php } ?>
+                        <?php } ?>
                         </div></fieldset>
         <?php
 

wp-includes/taxonomy.php

@@ -302 +302 @@
  *     * If false, no meta box is shown.
  * - capabilities - Array of capabilities for this taxonomy.
  *     * You can see accepted values in this function.
+ * - supports - Array of certain features that this taxonomy supports.
+ *     * If not set, defaults to array containing 'slug' & 'description'.
  * - rewrite - Triggers the handling of rewrites for this taxonomy. Defaults to true, using $taxonomy as slug.
  *     * To prevent rewrite, set to false.
  *     * To specify rewrite rules, an array can be passed with any of these keys
@@ -351 +353 @@
                 'show_admin_column'     => false,
                 'meta_box_cb'           => null,
                 'capabilities'          => array(),
+                'supports'              => array( 'slug', 'description' ),
                 'rewrite'               => true,
                 'query_var'             => $taxonomy,
                 'update_count_callback' => '',

wp-includes/taxonomy.php

@@ -63 +63 @@
                 'show_ui' => true,
                 'show_admin_column' => true,
                 '_builtin' => true,
+                'supports' => array(),
         ) );
 
         register_taxonomy( 'post_tag', 'post', array(