Ticket #6909: tag-to-cat2.patch

wp-admin/import/wp-cat2tag.php

@@ -24 +24 @@
-        }
-
-        function populate_cats() {
-                global $wpdb;
-
-                $categories = get_categories('get=all');
-                foreach ( $categories as $category ) {
-                        $this->all_categories[] = $category;
-tag_exists( $wpdb->escape($category->name)
+is_term( $category->slug, 'post_tag'
-                                $this->hybrids_ids[] = $category->term_id;
-                }
-        }
-
-        function populate_tags() {
-                global $wpdb;
-
-                $tags = get_terms( array('post_tag'), 'get=all' );
-                foreach ( $tags as $tag ) {
-                        $this->all_tags[] = $tag;
-$this->_category_exists($tag->term_id
+is_term( $tag->slug, 'category' 
-                                $this->hybrids_ids[] = $tag->term_id;
-                }
-        }
@@ -58 +56 @@
-                        echo '<p>' . __('Keep in mind that if you convert a category with child categories, the children become top-level orphans.') . '</p></div>';
-
-                        $this->categories_form();
-                } elseif ( $hyb_num > 0 ) {
-                         echo '<p>' . __('You have no categories that can be converted. However some of your categories are both a tag and a category.') . '</p>';
-                } else {
-                        echo '<p>'.__('You have no categories to convert!').'</p>';
-                }
@@ -92 +88 @@
-</script>
-
-<form name="catlist" id="catlist" action="admin.php?import=wp-cat2tag&amp;step=2" method="post">
-
+ /
-<?php wp_nonce_field('import-cat2tag'); ?></p>
-<ul style="list-style:none">
-<?php
-                $hier = _get_term_hierarchy('category');
-
+<?php   $hier = _get_term_hierarchy('category');
+
-                foreach ($this->all_categories as $category) {
-                        $category = sanitize_term( $category, 'category', 'display' );
-
-
-
-
-
-
-
-
+
+
-        <li><label><input type="checkbox" name="cats_to_convert[]" value="<?php echo intval($category->term_id); ?>" /> <?php echo $category->name . ' (' . $category->count . ')'; ?></label><?php
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-</ul>
-
-
-
-
-
-
+
+
+
-<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Convert Categories to Tags'); ?>" /></p>
-</form>
-
-
-
+
-
-        function tags_tab() {
-                $this->populate_tags();
@@ -142 +129 @@
-                        echo '<div class="narrow">';
-                        echo '<p>' . __('Here you can selectively converts existing tags to categories. To get started, check the tags you wish to be converted, then click the Convert button.') . '</p>';
-                        echo '<p>' . __('The newly created categories will still be associated with the same posts.') . '</p></div>';
-
-
+
-                        $this->tags_form();
-                } elseif ( $hyb_num > 0 ) {
-                         echo '<p>' . __('You have no tags that can be converted. However some of your tags are both a tag and a category.') . '</p>';
-                } else {
-                        echo '<p>'.__('You have no tags to convert!').'</p>';
-                }
@@ -179 +163 @@
-</script>
-
-<form name="taglist" id="taglist" action="admin.php?import=wp-cat2tag&amp;step=4" method="post">
-
+ /
-<?php wp_nonce_field('import-cat2tag'); ?></p>
-<ul style="list-style:none">
-<?php
-                foreach ( $this->all_tags as $tag ) {
-                        if ( in_array( intval($tag->term_id),  $this->hybrids_ids ) ) {
-?>
-        <li style="color:#777;padding-left:1.3em;"><?php echo attribute_escape($tag->name) . ' (' . $tag->count . ') *'; ?></li>
-<?php
-                        } else {
-?>
-        <li><label><input type="checkbox" name="tags_to_convert[]" value="<?php echo intval($tag->term_id); ?>" /> <?php echo attribute_escape($tag->name) . ' (' . $tag->count . ')'; ?></label></li>
-
-
-               }
-
-
+  foreach ( $this->all_tags as $tag ) { ?>
+<li><label><input type="checkbox" name="tags_to_convert[]" value="<?php echo intval($tag->term_id); ?>" /> <?php echo attribute_escape($tag->name) . ' (' . $tag->count . ')'; ?></label><?php if ( in_array( intval($tag->term_id),  $this->hybrids_ids ) ) echo ' <a href="#note"> * </a>'; ?></li>
+
+<?php  } 
-</ul>
-
-
-
-
-
+
+
-
-<p class="submit"><input type="submit" name="submit_tags" class="button" value="<?php _e('Convert Tags to Categories'); ?>" /></p>
-</form>
-
-
-
+
-
-
-
+
-
-                <ul style="list-style:none">
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+                        if ( in_array( intval($child->term_id), $this->hybrids_ids ) )
+                                echo ' <a href="#note"> * </a>';
+
-                        if ( isset($hier[$child->term_id]) )
-
-
-
-
-
-
-
-
+
+
+
-        }
-
-        function _category_exists($cat_id) {
@@ -252 +212 @@
-        function convert_categories() {
-                global $wpdb;
-
-
-echo '<div class="narrow">';
-echo '<p>' . sprintf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag') . '</p>';
-echo '</div>';
-       
+ ?>
+<div class="narrow">
+<p><?php printf(__('Uh, oh. Something didn&#8217;t work. Please <a href="%s">try again</a>.'), 'admin.php?import=wp-cat2tag'); ?></p>
+</div>
+<?php
-                }
-
-                if ( empty($this->categories_to_convert) )
-                        $this->categories_to_convert = $_POST['cats_to_convert'];
+
-                $hier = _get_term_hierarchy('category');
+                $hybrid_cats = $clear_parents = $parents = false;
+                $clean_term_cache = $clean_cat_cache = array();
+                $default_cat = get_option('default_category');
-
-                echo '<ul>';
-
-                foreach ( (array) $this->categories_to_convert as $cat_id) {
-                        $cat_id = (int) $cat_id;
-
-
-
-
-
+
+
-                        } else {
-                                $category =& get_category($cat_id);
+                                echo '<li>' . sprintf(__('Converting category <strong>%s</strong> ... '),  $category->name);
-
-
-
-
-
-
+
+
-
-// If the category is the default, leave category in place and create tag.
-if ( get_option('default_category') == $category->term_id ) {
-$id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug));
+       if ( ! ($id = is_term( $category->slug, 'post_tag' ) ) )
+               $id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug));
+
-                                        $id = $id['term_taxonomy_id'];
-                                        $posts = get_objects_in_term($category->term_id, 'category');
+                                        $term_order = 0;
+
-                                        foreach ( $posts as $post ) {
-
-
+
-                                                clean_post_cache($post);
-                                        }
-
-
-
-
-
-
+
+
+
+
+
-                                        }
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                                // Clean the cache
-                                clean_category_cache($category->term_id);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
+                }
+                echo '</ul>';
-
-
+
+
+
+
-                }
-
-
+
+
+
+
+
+
+
+
+
+
-                echo '<p>' . sprintf( __('We&#8217;re all done here, but you can always <a href="%s">convert more</a>.'), 'admin.php?import=wp-cat2tag' ) . '</p>';
-        }
-
@@ -332 +336 @@
-                        return;
-                }
-
-categorie
+tag
-                        $this->tags_to_convert = $_POST['tags_to_convert'];
-
-
+
+
+
-                echo '<ul>';
-
-                foreach ( (array) $this->tags_to_convert as $tag_id) {
-                        $tag_id = (int) $tag_id;
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        continue;
-                                }
-
-                                $tt_ids = $wpdb->get_col( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $tag_id) );
-                                if ( $tt_ids ) {
-                                                $posts = $wpdb->get_col("SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id IN (" . join(',', $tt_ids) . ") GROUP BY object_id");
-                                        foreach ( (array) $posts as $post )
-                                                clean_post_cache($post);
-                                }
-
-                                // Change the tag to a category.
-
-
+->term
+ {
-                                        $reset_parent = '';
-
+
+
+
-
-
+->term
-
-
-
+
+
+
-
-
+
+
-                        }
+                }
-
-
+
+
+
+
-                }
-
-
-
-
+
+
+
+
+
+
+
+
-                echo '</ul>';
+                if ( $hybrid_tags )
+                        echo '<p>' . sprintf( __('* This tag is also a category. The converter has added all posts from it to the category. If you want to remove it, please confirm that all posts were added successfully, then delete it from the <a href="%s">Manage Tags</a> page.'), 'edit-tags.php') . '</p>';
-                echo '<p>' . sprintf( __('We&#8217;re all done here, but you can always <a href="%s">convert more</a>.'), 'admin.php?import=wp-cat2tag&amp;step=3' ) . '</p>';
-        }
-
@@ -401 +433 @@
-                                        check_admin_referer('import-cat2tag');
-                                        $this->convert_categories();
-                                break;
-
+
-                                case 3 :
-                                        $this->tags_tab();
-                                break;
-
+
-                                case 4 :
-                                        check_admin_referer('import-cat2tag');
-                                        $this->convert_tags();

wp-admin/wp-admin.css

@@ -547 +547 @@
-        border-top-style: solid;
-}
-
-
+, #taglist a, #catlist a
-        text-decoration: none;
-}
-