From 6f289a7be8870c4b9dffd518c59c420f38051378 Mon Sep 17 00:00:00 2001 From: nacin Date: Fri, 11 Jun 2010 00:00:47 +0000 Subject: [PATCH] Check for the import cap before showing links to the tag/cat converter. props kpdesign, fixes #13834. git-svn-id: http://svn.automattic.com/wordpress/trunk@15205 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-tags.php | 4 +++- wp-admin/tools.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 2624e4b28..64059bd61 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -337,9 +337,11 @@ if ( $page_links )

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') ?>

+
- +

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

diff --git a/wp-admin/tools.php b/wp-admin/tools.php index 0e36f2ac6..20cecf6ba 100644 --- a/wp-admin/tools.php +++ b/wp-admin/tools.php @@ -38,9 +38,9 @@ require_once('./admin-header.php'); cap->manage_terms) || current_user_can($tags->cap->manage_terms) ) : ?>

@@ -48,6 +48,7 @@ if ( current_user_can($cats->cap->manage_terms) || current_user_can($tags->cap->