From 5398fafd1bd706b74941d1a68fcfdc1964e9d9d9 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 27 May 2010 04:35:11 +0000
Subject: [PATCH] Revert [14853], [14778], returning tag/cat converter to
 tools.php and edit-tags.php. Link to import.php instead of the converter
 directly as it may not be installed. see #13566.

git-svn-id: http://svn.automattic.com/wordpress/trunk@14978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-tags.php |  5 +++++
 wp-admin/tools.php     | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 07b0aea05..701857a6e 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -338,6 +338,11 @@ if ( $page_links )
 <?php if ( 'category' == $taxonomy ) : ?>
 <div class="form-wrap">
 <p><?php printf(__('<strong>Note:</strong><br />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 <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
+<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'import.php') ?></p>
+</div>
+<?php elseif ( 'post_tag' == $taxonomy ) : ?>
+<div class="form-wrap">
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>'), 'import.php') ;?>.</p>
 </div>
 <?php endif;
 do_action('after-' . $taxonomy . '-table', $taxonomy);
diff --git a/wp-admin/tools.php b/wp-admin/tools.php
index 0edd16fbd..1ca25aa75 100644
--- a/wp-admin/tools.php
+++ b/wp-admin/tools.php
@@ -37,6 +37,17 @@ require_once('./admin-header.php');
 <?php
 endif;
 
+$cats = get_taxonomy('category');
+$tags = get_taxonomy('post_tag');
+
+if ( current_user_can($cats->cap->manage_terms) || current_user_can($tags->cap->manage_terms) ) : ?>
+<div class="tool-box">
+    <h3 class="title"><?php _e( 'Categories and Tags Converter' ) ?></h3>
+    <p><?php printf( __('<a href="%s">Use this</a> to convert categories to tags or tags to categories</a>.'), 'import.php' ); ?></p>
+</div>
+<?php
+endif;
+
 do_action( 'tool_box' );
 ?>
 </div>