Ticket #9381: 9381.002.diff

trunk/wp-includes/category-template.php

@@ -293 +293 @@
  * @return string Category description, available.
  */
 function category_description( $category = 0 ) {
-        global $cat;
-        if ( !$category )
-                $category = $cat;
-
-        return get_term_field( 'description', $category, 'category' );
+        return term_description( $category, 'category' );
 }
 
 /**
@@ -799 +795 @@
 }
 
 /**
+ * Retrieve tag description.
+ *
+ * @since 2.9
+ *
+ * @param int $tag Optional. Tag ID. Will use global tag ID by default.
+ * @return string Tag description, available.
+ */
+function tag_description( $tag = 0 ) {
+        return term_description( $tag );
+}
+
+/**
+ * Retrieve term description.
+ *
+ * @since 2.9
+ *
+ * @param int $term Optional. Term ID. Will use global term ID by default.
+ * @return string Term description, available.
+ */
+function term_description( $term = 0, $taxonomy = 'post_tag' ) {
+        if ( !$term && ( is_tax() || is_tag() || is_category() ) ) {
+                global $wp_query;
+                $term = $wp_query->get_queried_object();
+                $taxonomy = $term->taxonomy;
+                $term = $term->term_id;
+        }
+        return get_term_field( 'description', $term, $taxonomy );
+}
+
+/**
  * Retrieve the terms of the taxonomy that are attached to the post.
  *
  * This function can only be used within the loop.

trunk/wp-admin/admin-ajax.php

@@ -1169 +1169 @@
                         else
                                 $taxonomy = 'post_tag';
 
+                        $tag = get_term( $id, $taxonomy );
+                        $_POST['description'] = $tag->description;
+
                         $updated = wp_update_term($id, $taxonomy, $_POST);
                         if ( $updated && !is_wp_error($updated) ) {
                                 $tag = get_term( $updated['term_id'], $taxonomy );

trunk/wp-admin/includes/template.php

@@ -668 +668 @@
                                         $out .= '<div class="name">' . $qe_data->name . '</div>';
                                         $out .= '<div class="slug">' . $qe_data->slug . '</div></div></td>';
                                         break;
+                                case 'description':
+                                        $out .= "<td $attributes>$tag->description</td>";
+                                        break;
                                 case 'slug':
                                         $out .= "<td $attributes>$tag->slug</td>";
                                         break;
@@ -872 +875 @@
                         $_wp_column_headers[$page] = array(
                                 'cb' => '<input type="checkbox" />',
                                 'name' => __('Name'),
+                                'description' => __('Description'),
                                 'slug' => __('Slug'),
                                 'posts' => __('Posts')
                         );

trunk/wp-admin/edit-tags.php

@@ -287 +287 @@
         <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
 </div>
 
+<div class="form-field">
+        <label for="description"><?php _e('Description') ?></label>
+        <textarea name="description" id="description" rows="5" cols="40"></textarea>
+    <p><?php _e('The description is not prominent by default, however some themes may show it.'); ?></p>
+</div>
+
 <p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Tag'); ?>" /></p>
 <?php do_action('add_tag_form'); ?>
 </form></div>

trunk/wp-admin/edit-tag-form.php

@@ -34 +34 @@
                         <td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" size="40" />
             <p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
                 </tr>
+                <tr class="form-field">
+                        <th scope="row" valign="top"><label for="description"><?php _e('Description') ?></label></th>
+                        <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($tag->description); ?></textarea><br />
+            <?php _e('The description is not prominent by default, however some themes may show it.'); ?></td>
+                </tr>
         </table>
 <p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e('Update Tag'); ?>" /></p>
 <?php do_action('edit_tag_form', $tag); ?>