Changeset 5529

Timestamp:

05/23/07 18:07:53 (1 year ago)

Author:

ryan

Message:

Set and get post cats to taxonomy. see #4189

Files:

• trunk/wp-admin/admin-functions.php (modified) (5 diffs)
• trunk/wp-admin/edit-category-form.php (modified) (1 diff)
• trunk/wp-includes/category-template.php (modified) (9 diffs)
• trunk/wp-includes/category.php (modified) (1 diff)
• trunk/wp-includes/post.php (modified) (2 diffs)
• trunk/wp-includes/taxonomy.php (modified) (2 diffs)

trunk/wp-admin/admin-functions.php

@@ -679 +679 @@
-
-function get_nested_categories( $default = 0, $parent = 0 ) {
-link_id, $
+
-
-    if ( $post_ID ) {
-
-
-
-
-
+
-
-        if ( count( $checked_categories ) == 0 ) {
@@ -692 +688 @@
-            $checked_categories[] = $default;
-        }
-    } else if ( $link_id ) {
-        $checked_categories = $wpdb->get_col( "
-             SELECT category_id
-             FROM $wpdb->categories, $wpdb->link2cat
-             WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id'
-             " );
-
-        if ( count( $checked_categories ) == 0 ) {
-            // No selected categories, strange
-            $checked_categories[] = $default;
-        }
-    } else {
-        $checked_categories[] = $default;
-    }
-
-return_categories_list( $parent
+get_categories("child_of=$parent&hide_empty=0&get=ids"
-    $result = array ();
-
-    if ( is_array( $cats ) ) {
-        foreach ( $cats as $cat) {
-
+//
-            $result[$cat]['cat_ID'] = $cat;
-            $result[$cat]['checked'] = in_array( $cat, $checked_categories );
@@ -755 +740 @@
-    }
-
-
+&hide_empty=0
-    
-    if ( empty($categories) )
@@ -773 +758 @@
-        $categories = get_categories( 'hide_empty=0' );
-
-category_hierarchy(
+term_hierarchy('category'
-
-    if ( $categories ) {
@@ -960 +945 @@
-    if ( $categories ) {
-        foreach ( $categories as $category ) {
-cat_ID && $parent == $category->category_
+term_id && $parent == $category->
-                $pad = str_repeat( '– ', $level );
-cat_name = wp_specialchars( $category->cat_
-cat_ID
-cat_ID
+name = wp_specialchars( $category->
+term_id
+term_id
-                    echo " selected='selected'";
-cat_
-cat_ID
+
+term_id
-            }
-        }

trunk/wp-admin/edit-category-form.php

@@ -22 +22 @@
-<?php echo $form ?>
-<input type="hidden" name="action" value="<?php echo $action ?>" />
-cat_ID
+term_id
-<?php wp_nonce_field($nonce_action); ?>
-    <table class="editform" width="100%" cellspacing="2" cellpadding="5">
-        <tr>
-            <th width="33%" scope="row" valign="top"><label for="cat_name"><?php _e('Category name:') ?></label></th>
-cat_
+
-        </tr>
-        <tr>
-            <th scope="row" valign="top"><label for="category_nicename"><?php _e('Category slug:') ?></label></th>
-category_nicename
+slug
-        </tr>
-        <tr>
-            <th scope="row" valign="top"><label for="category_parent"><?php _e('Category parent:') ?></label></th>
-            <td>        
-category_
+
-            </td>
-        </tr>
-        <tr>
-            <th scope="row" valign="top"><label for="category_description"><?php _e('Description: (optional)') ?></label></th>
-category_
+
-        </tr>
-    </table>

trunk/wp-includes/category-template.php

@@ -13 +13 @@
-
-        $category = get_category($cat_id);
-category_
-cat_ID
-cat_ID
+
+term_id
+term_id
-        }
-    }
@@ -30 +30 @@
-    } else {
-        $category = &get_category($category_id);
-category_nicename
-
-category_
+slug
+
+
-            $category_nicename = get_category_parents($parent, false, '/', true) . $category_nicename;
-
@@ -46 +46 @@
-
-    if ( $nicename )
-category_nicename
+slug
-    else
-        $name = $parent->cat_name;
-
-category_parent && ($parent->category_parent != $parent->cat_ID
-category_
+parent && ($parent->parent != $parent->term_id
+
-
-    if ( $link )
-cat_ID
+term_id
-    else
-        $chain .= $name.$separator;
@@ -61 +61 @@
-
-function get_the_category($id = false) {
-
+   
-
-    $id = (int) $id;
@@ -67 +67 @@
-        $id = (int) $post->ID;
-
-
-
-
-
+
-
-    if ( !empty($categories) )
@@ -87 +84 @@
-    $cat_ID = (int) $cat_ID;
-    $category = &get_category($cat_ID);
-cat_
+
-}
-
@@ -105 +102 @@
-            switch ( strtolower($parents) ) {
-                case 'multiple':
-category_
-category_
-cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_
+
+
+term_id) . '" title="' . sprintf(__("View all posts in %s"), $category->name) . '" ' . $rel . '>' . $category->
-                    break;
-                case 'single':
-cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_
-category_
-category_
-cat_
+term_id) . '" title="' . sprintf(__("View all posts in %s"), $category->
+
+
+
-                    break;
-                case '':
-                default:
-cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_
+term_id) . '" title="' . sprintf(__("View all posts in %s"), $category->
-            }
-        }
@@ -128 +125 @@
-            switch ( strtolower($parents) ) {
-                case 'multiple':
-category_
-category_
-cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_
+
+
+term_id) . '" title="' . sprintf(__("View all posts in %s"), $category->
-                    break;
-                case 'single':
-cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_
-category_
-category_
+term_id) . '" title="' . sprintf(__("View all posts in %s"), $category->
+
+
-                    $thelist .= "$category->cat_name</a>";
-                    break;
-                case '':
-                default:
-cat_ID) . '" title="' . sprintf(__("View all posts in %s"), $category->cat_name) . '" ' . $rel . '>' . $category->cat_
+term_id) . '" title="' . sprintf(__("View all posts in %s"), $category->name) . '" ' . $rel . '>' . $category->
-            }
-            ++$i;
@@ -166 +163 @@
-        $category = $cat;
-    $category = & get_category($category);
-category_description, $category->cat_ID
+description, $category->term_id
-}
-

trunk/wp-includes/category.php

@@ -103 +103 @@
-} 
-
-//
-// Private
-//
-
-function &_get_cat_children($category_id, $categories) {
-    if ( empty($categories) )
-        return array();
-
-    $category_list = array();
-    $has_children = _get_category_hierarchy();
-
-    if  ( ( 0 != $category_id ) && ! isset($has_children[$category_id]) )
-        return array();
-
-    foreach ( $categories as $category ) {
-        if ( $category->cat_ID == $category_id )
-            continue;
-
-        if ( $category->category_parent == $category_id ) {
-            $category_list[] = $category;
-
-            if ( !isset($has_children[$category->cat_ID]) )
-                continue;
-
-            if ( $children = _get_cat_children($category->cat_ID, $categories) )
-                $category_list = array_merge($category_list, $children);
-        }
-    }
-
-    return $category_list;
-}
-
-// Recalculates link or post counts by including items from child categories
-// Assumes all relevant children are already in the $categories argument
-function _pad_category_counts($type, &$categories) {
-    global $wpdb;
-
-    // Set up some useful arrays
-    foreach ( $categories as $key => $cat ) {
-        $cats[$cat->cat_ID] = & $categories[$key];
-        $cat_IDs[] = $cat->cat_ID;
-    }
-
-    // Get the relevant post2cat or link2cat records and stick them in a lookup table
-    if ( $type == 'post' ) {
-        $results = $wpdb->get_results("SELECT post_id, category_id FROM $wpdb->post2cat LEFT JOIN $wpdb->posts ON post_id = ID WHERE category_id IN (".join(',', $cat_IDs).") AND post_type = 'post' AND post_status = 'publish'");
-        foreach ( $results as $row )
-            ++$cat_items[$row->category_id][$row->post_id];
-    } else {
-        $results = $wpdb->get_results("SELECT $wpdb->link2cat.link_id, category_id FROM $wpdb->link2cat LEFT JOIN $wpdb->links USING (link_id) WHERE category_id IN (".join(',', $cat_IDs).") AND link_visible = 'Y'");
-        foreach ( $results as $row )
-            ++$cat_items[$row->category_id][$row->link_id];
-    }
-
-    // Touch every ancestor's lookup row for each post in each category
-    foreach ( $cat_IDs as $cat_ID ) {
-        $child = $cat_ID;
-        while ( $parent = $cats[$child]->category_parent ) {
-            if ( !empty($cat_items[$cat_ID]) )
-                foreach ( $cat_items[$cat_ID] as $item_id => $touches )
-                    ++$cat_items[$parent][$item_id];
-            $child = $parent;
-        }
-    }
-
-    // Transfer the touched cells 
-    foreach ( (array) $cat_items as $id => $items )
-        if ( isset($cats[$id]) )
-            $cats[$id]->{'link' == $type ? 'link_count' : 'category_count'} = count($items);
-}
-
-function _get_category_hierarchy() {
-    return _get_term_hierarchy('category');
-}
-
-// Tags
-

trunk/wp-includes/post.php

@@ -448 +448 @@
-    $post_id = (int) $post_id;
-
-
-
-
-
-
+
+
-}
-
@@ -806 +803 @@
-        $post_categories = array(get_option('default_category'));
-
+    $post_categories = array_map('intval', $post_categories);
-    $post_categories = array_unique($post_categories);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}   // wp_set_post_categories()
-

trunk/wp-includes/taxonomy.php

@@ -225 +225 @@
-        $in_taxonomies = "'" . implode("', '", $taxonomies) . "'";
-        $old_terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($in_taxonomies) AND tr.object_id = '$object_id'");
+        if ( empty($old_terms) )
+            $old_terms = array();
-    }
-
@@ -263 +265 @@
-    global $wpdb;
-    $taxonomies = ($single_taxonomy = !is_array($taxonomy)) ? array($taxonomy) : $taxonomy;
+    // TODO cast to int
-    $object_ids = ($single_object = !is_array($object_id)) ? array($object_id) : $object_id;
-