Merge pull request #2 from WordPress/fix/support-for-wp-6-1

zaerl · web-flow · commit a1c68a29c866 · 2022-11-30T07:35:12.000+01:00
Add support for WordPress 6.1
diff --git a/readme.txt b/readme.txt
@@ -1,10 +1,10 @@
 === Categories to Tags Converter ===
 Contributors: wordpressdotorg
-Donate link: 
+Donate link:
 Tags: importer, categories and tags converter
 Requires at least: 3.0
-Tested up to: 4.1
-Stable tag: 0.5
+Tested up to: 6.1
+Stable tag: 0.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -22,8 +22,20 @@ Convert existing categories to tags or tags to categories, selectively.
 
 == Changelog ==
 
+= 0.6 =
+* Add support for WordPress 6.1
+
 = 0.5 =
-* Fix issue where WordPress could not load the importer.
+* Fix issue where WordPress could not load the importer
+
+= 0.4 =
+* Fixes #WP13460
+
+= 0.3 =
+* Change handle to match plugin slug
+
+= 0.2 =
+* Add WP_LOAD_IMPORTERS check
 
 = 0.1 =
 * Initial release
diff --git a/wpcat2tag-importer.php b/wpcat2tag-importer.php
@@ -5,7 +5,7 @@
 Description: Convert existing categories to tags or tags to categories, selectively.
 Author: wordpressdotorg
 Author URI: http://wordpress.org/
-Version: 0.5.2
+Version: 0.6
 License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 */
 
@@ -54,7 +54,11 @@ function header( $current_tab ) {
 			$tabs['formats'] = array( 'label' => __( 'Formats', 'wpcat2tag-importer' ), 'url' => admin_url( 'admin.php?import=wpcat2tag&tab=formats' ) ); ?>
 
 		<div class="wrap">
-		<?php screen_icon(); ?>
+		<?php
+			if ( version_compare( get_bloginfo( 'version' ), '3.8.0', '<' ) ) {
+				screen_icon();
+			}
+		?>
 		<h2><?php _e( 'Categories, Tags and Formats Converter', 'wpcat2tag-importer' ); ?></h2>
 		<h3 class="nav-tab-wrapper">
 		<?php foreach ( $tabs as $tab => $info ) :
@@ -248,7 +252,7 @@ function convert_formats() {
 		$convert_to = 'tag' == $_POST['convert_to'] ? 'post_tag' : 'category';
 		if ( ! $term_info = term_exists( $_POST['convert_to_slug'], $convert_to ) )
 			$term_info = wp_insert_term( $_POST['convert_to_slug'], $convert_to );
-			
+
 		if ( is_wp_error($term_info) ) {
 			echo '<p>' . $term_info->get_error_message() . ' ';
 			printf( __( 'Please <a href="%s">try again</a>.', 'wpcat2tag-importer' ), 'admin.php?import=wpcat2tag&amp;tab=cats' ) . "</p>\n";
@@ -307,7 +311,7 @@ function convert_categories() {
 			echo '</div>';
 			return;
 		}
-		
+
 		$default = get_option( 'default_category' );
 
 		if ( ! isset($_POST['convert_to']) || 'format' != $_POST['convert_to'] ) {
@@ -337,7 +341,7 @@ function convert_categories() {
 				if ( 'post_tag' == $convert_to ) {
 					if ( ! $term_info = term_exists( $category->slug, 'post_tag' ) )
 						$term_info = wp_insert_term( $category->name, 'post_tag', array( 'description' => $category->description ) );
-						
+
 					if ( is_wp_error($term_info) ) {
 						echo $term_info->get_error_message() . "</li>\n";
 						continue;
@@ -351,7 +355,7 @@ function convert_categories() {
 						$values[] = $wpdb->prepare( "(%d, %d, 0)", $post, $term_info['term_taxonomy_id'] );
 						clean_post_cache( $post );
 					}
-					
+
 					$wpdb->query( "INSERT INTO {$wpdb->term_relationships} (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) );
 					$wpdb->update( $wpdb->term_taxonomy, array( 'count' => $category->count ), array( 'term_id' => $term_info['term_id'], 'taxonomy' => $convert_to ) );
 				// otherwise just convert it
@@ -404,7 +408,7 @@ function convert_tags() {
 				if ( 'category' == $convert_to ) {
 					if ( ! $term_info = term_exists( $tag->slug, 'category' ) )
 						$term_info = wp_insert_term( $tag->name, 'category', array( 'description' => $tag->description ) );
-						
+
 					if ( is_wp_error($term_info) ) {
 						echo $term_info->get_error_message() . "</li>\n";
 						continue;
