Ticket #11937: 11937.4.diff

wp-admin/admin-ajax.php

@@ -502 +502 @@
         if ( !current_user_can( 'manage_categories' ) )
                 die('-1');
 
-        if ( '' === trim($_POST['name']) ) {
+        if ( '' === trim($_POST['link_name']) ) {
                 $x = new WP_Ajax_Response( array(
                         'what' => 'link-cat',
                         'id' => new WP_Error( 'name', __('You did not enter a category name.') )
@@ -510 +510 @@
                 $x->send();
         }
 
-        $r = wp_insert_term($_POST['name'], 'link_category', $_POST );
+        $r = wp_insert_term($_POST['link_name'], 'link_category', array('description' => $_POST['link_description'], 'slug' => $_POST['link_slug']) );
         if ( is_wp_error( $r ) ) {
                 $x = new WP_AJAX_Response( array(
                         'what' => 'link-cat',
@@ -541 +541 @@
         if ( !current_user_can( $tax->edit_cap ) )
                 die('-1');
 
-        $tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );
+        $tag = wp_insert_term($_POST['tag-name'], $taxonomy, array('description' => $_POST['tag-description'], 'slug' => $_POST['tag-slug']) );
 
         if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
                 echo '<div class="error"><p>' . __('An error has occured. Please reload the page and try again.') . '</p></div>';

wp-admin/edit-link-categories.php

@@ -197 +197 @@
 <?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-link-category'); ?>
 
 <div class="form-field form-required">
-        <label for="name"><?php _e('Link Category name') ?></label>
-        <input name="name" id="name" type="text" value="" size="40" aria-required="true" />
+        <label for="link_name"><?php _e('Link Category name') ?></label>
+        <input name="link_name" id="link_name" type="text" value="" size="40" aria-required="true" />
+        <p><?php _e('The name of the link category. This is very prominent when using the &#8220;links&#8221; widget.'); ?></p>
 </div>
 <?php if ( !is_multisite() ) { ?>
 <div class="form-field">
-        <label for="slug"><?php _e('Link Category slug') ?></label>
-        <input name="slug" id="slug" type="text" value="" size="40" />
+        <label for="link_slug"><?php _e('Link Category slug') ?></label>
+        <input name="link_slug" id="link_slug" type="text" value="" 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>
 </div>
 <?php } ?>
 <div class="form-field">
-        <label for="description"><?php _e('Description (optional)') ?></label>
-        <textarea name="description" id="description" rows="5" cols="40"></textarea>
+        <label for="link_description"><?php _e('Description (optional)') ?></label>
+        <textarea name="link_description" id="link_description" rows="5" cols="40"></textarea>
         <p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
 </div>
 

wp-admin/edit-tags.php

@@ -310 +310 @@
 </div>
 <?php if ( !is_multisite() ) { ?>
 <div class="form-field">
-        <label for="slug"><?php _e('Tag slug') ?></label>
-        <input name="slug" id="slug" type="text" value="" size="40" />
+        <label for="tag-slug"><?php _e('Tag slug') ?></label>
+        <input name="tag-slug" id="tag-slug" type="text" value="" 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>
 </div>
 <?php } ?>
@@ -323 +323 @@
 </div>
 <?php } ?>
 <div class="form-field">
-        <label for="description"><?php _e('Description') ?></label>
-        <textarea name="description" id="description" rows="5" cols="40"></textarea>
+        <label for="tag-description"><?php _e('Description') ?></label>
+        <textarea name="tag-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>
 

wp-admin/link-category.php

@@ -23 +23 @@
         if ( !current_user_can('manage_categories') )
                 wp_die(__('Cheatin’ uh?'));
 
-        if ( wp_insert_term($_POST['name'], 'link_category', $_POST ) ) {
+        if ( wp_insert_term($_POST['link_name'], 'link_category', $_POST ) ) {
                 wp_redirect('edit-link-categories.php?message=1#addcat');
         } else {
                 wp_redirect('edit-link-categories.php?message=4#addcat');