WordPress 4.3

[autoinstalls/wordpress.git] / wp-admin / edit-tags.php

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 7afbec8bcd8215234cd115322bd2a227eaec480b..db8319cdd42e2e9fd22f955010f7a997ec763f00 100644 (file)
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -20,7 +20,11 @@ if ( ! $tax )
 if ( ! current_user_can( $tax->cap->manage_terms ) )
        wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-// $post_type is set when the WP_Terms_List_Table instance is created
+/**
+ * $post_type is set when the WP_Terms_List_Table instance is created
+ *
+ * @global string $post_type
+ */
 global $post_type;
 
 $wp_list_table = _get_list_table('WP_Terms_List_Table');
@@ -298,13 +302,20 @@ 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">
-<h2><?php echo esc_html( $title );
+<h1><?php echo esc_html( $title );
 if ( !empty($_REQUEST['s']) )
        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
-</h2>
+</h1>
 
 <?php if ( $message ) : ?>
 <div id="message" class="<?php echo $class; ?> notice is-dismissible"><p><?php echo $message; ?></p></div>
@@ -343,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;