From 66c1d75c1cf6d1698261aa4c19610ee0aa529ad0 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Tue, 16 Jun 2015 04:30:26 +0000
Subject: [PATCH] Tag/category conversion link on edit-tags.php should point to
 specific importer page when cat2tag plugin is active.

Props solarissmoke, c3mdigital.
Fixes #16369.
Built from https://develop.svn.wordpress.org/trunk@32792


git-svn-id: http://core.svn.wordpress.org/trunk@32763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-tags.php  | 11 +++++++++--
 wp-includes/version.php |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 5720b7a7ef..327493f475 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -302,6 +302,13 @@ if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
 }
 
 $class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated';
+
+if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) {
+	$import_link = admin_url( 'admin.php?import=wpcat2tag' );
+} else {
+	$import_link = admin_url( 'import.php' );
+}
+
 ?>
 
 <div class="wrap nosubsub">
@@ -347,12 +354,12 @@ endif; ?>
 	?>
 </p>
 <?php if ( current_user_can( 'import' ) ) : ?>
-<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'import.php') ?></p>
+<p><?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ) ?></p>
 <?php endif; ?>
 </div>
 <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
 <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>
+<p><?php printf( __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ), esc_url( $import_link ) ) ;?></p>
 </div>
 <?php endif;
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 943be2f3be..7bd397599f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32791';
+$wp_version = '4.3-alpha-32792';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.