From 9c5afca0f378c01da620b1d6e5e8bd8363a23310 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Sat, 23 Nov 2013 21:18:10 +0000 Subject: [PATCH] Cleanup incorrect duplicate comments for hooks in wp-admin/edit-tag-form.php introduced in [26274]. Also corrects the @since version for {$taxonomy}_term_new_form_tag in wp-admin/edit-tags.php. Props kpdesign. See #25532. Built from https://develop.svn.wordpress.org/trunk@26339 git-svn-id: http://core.svn.wordpress.org/trunk@26240 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-tag-form.php | 4 ---- wp-admin/edit-tags.php | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php index dd611dacbb..5e1ca0eeef 100644 --- a/wp-admin/edit-tag-form.php +++ b/wp-admin/edit-tag-form.php @@ -18,16 +18,12 @@ if ( empty($tag_ID) ) { ?> // Back compat hooks if ( 'category' == $taxonomy ) { - /** This action is documented in wp-admin/edit-tags.php */ do_action( 'edit_category_form_pre', $tag ); } elseif ( 'link_category' == $taxonomy ) { - /** This action is documented in wp-admin/edit-tags.php */ do_action( 'edit_link_category_form_pre', $tag ); } else { - /** This action is documented in wp-admin/edit-tags.php */ do_action( 'edit_tag_form_pre', $tag ); } -/** This action is documented in wp-admin/edit-tags.php */ do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 795879dbc1..a253d92f97 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -337,6 +337,7 @@ endif; ?>
+

Note:
Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?>

category to tag converter.'), 'import.php') ?>

@@ -437,7 +438,7 @@ if ( current_user_can($tax->cap->edit_terms) ) { * * The dynamic portion of the hook name, $taxonomy, refers to the taxonomy slug. * - * @since 3.0.0 + * @since 3.7.0 */ ?>
>