WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Boone Gorges 2015-06-16 04:30:26 +00:00
parent 362704ab9a
commit 66c1d75c1c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/edit-tags.php
View File

@ -302,6 +302,13 @@ if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
} }
$class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated'; $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"> <div class="wrap nosubsub">
@ -347,12 +354,12 @@ endif; ?>
?> ?>
</p> </p>
<?php if ( current_user_can( 'import' ) ) : ?> <?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; ?> <?php endif; ?>
</div> </div>
<?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?> <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
<div class="form-wrap"> <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> </div>
<?php endif; <?php endif;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.