Changeset 8077

Timestamp:

06/13/08 20:23:29 (4 months ago)

Author:

ryan

Message:

Tag to cat converter improvements from azaozz. see #6909

Files:

• trunk/wp-admin/import/wp-cat2tag.php (modified) (11 diffs)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)

trunk/wp-admin/import/wp-cat2tag.php

@@ -25 +25 @@
-
-    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;
-        }
@@ -36 +35 @@
-
-    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;
-        }
@@ -59 +57 @@
-
-            $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>';
@@ -93 +89 @@
-
-<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
-
-        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() {
@@ -143 +130 @@
-            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>';
@@ -180 +164 @@
-
-<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">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-</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 ( isset($hier[$child->term_id]) )
-
-
-
-
-
-
-
-
+
+
+
-    }
-
@@ -253 +213 @@
-        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>';
@@ -269 +233 @@
-            $cat_id = (int) $cat_id;
-
-
-
-
-
+
+
-            } else {
-                $category =& get_category($cat_id);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    continue;
-                }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        clean_post_cache($post);
-                    }
-                } else {
-                    $tt_ids = $wpdb->get_col( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'category'", $category->term_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 category to a tag.
-                    $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET taxonomy = 'post_tag' WHERE term_id = %d AND taxonomy = 'category'", $category->term_id) );
-
-                    $terms = $wpdb->get_col( $wpdb->prepare("SELECT term_id FROM $wpdb->term_taxonomy WHERE parent = %d AND taxonomy = 'category'", $category->term_id) );
-                    foreach ( (array) $terms as $term )
-                        clean_category_cache($term);
-
-                    // Set all parents to 0 (root-level) if their parent was the converted tag
-                    $wpdb->query( $wpdb->prepare("UPDATE $wpdb->term_taxonomy SET parent = 0 WHERE parent = %d AND taxonomy = 'category'", $category->term_id) );
-                }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
+
-        echo '</ul>';
+
+        if ( ! empty($clean_term_cache) ) {
+            $clean_term_cache = array_unique(array_values($clean_term_cache));
+            foreach ( $clean_term_cache as $id )
+                wp_cache_delete($id, 'post_tag');
+        }
+
+        if ( ! empty($clean_cat_cache) ) {
+            $clean_cat_cache = array_unique(array_values($clean_cat_cache));
+            foreach ( $clean_cat_cache as $id )
+                wp_cache_delete($id, 'category');
+        }
+
+        if ( $clear_parents ) delete_option('category_children');
+
+        if ( $hybrid_cats )
+            echo '<p>' . sprintf( __('* This category is also a tag. The converter has added that tag to all posts currently in the category. If you want to remove it, please confirm that all tags were added successfully, then delete it from the <a href="%s">Manage Categories</a> page.'), 'categories.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' ) . '</p>';
-    }
@@ -333 +337 @@
-        }
-
-categorie
+tag
-            $this->tags_to_convert = $_POST['tags_to_convert'];
-
-
+
+
+
-        echo '<ul>';
-
@@ -342 +348 @@
-            $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 = '';
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        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>';
-    }
@@ -402 +434 @@
-                    $this->convert_categories();
-                break;
-
+
-                case 3 :
-                    $this->tags_tab();
-                break;
-
+
-                case 4 :
-                    check_admin_referer('import-cat2tag');

trunk/wp-admin/wp-admin.css

@@ -601 +601 @@
-}
-
-
+, #taglist a, #catlist a
-    text-decoration: none;
-}