Changeset 5529 for trunk/wp-admin/admin-functions.php

Timestamp:

05/23/2007 06:07:53 PM (19 years ago)

Author:

ryan

Message:

Set and get post cats to taxonomy. see #4189

File:

• trunk/wp-admin/admin-functions.php (modified) (5 diffs)

trunk/wp-admin/admin-functions.php

@@ -679 +679 @@
 
 function get_nested_categories( $default = 0, $parent = 0 ) {
-    global $post_ID, $link_id, $mode, $wpdb;
+    global $post_ID, $mode, $wpdb;
 
     if ( $post_ID ) {
-        $checked_categories = $wpdb->get_col( "
-             SELECT category_id
-             FROM $wpdb->categories, $wpdb->post2cat
-             WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID' AND rel_type = 'category'
-             " );
+        $checked_categories = wp_get_post_categories($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;
     }
 
-    $cats = return_categories_list( $parent);
+    $cats = get_categories("child_of=$parent&hide_empty=0&get=ids");
     $result = array ();
 
     if ( is_array( $cats ) ) {
         foreach ( $cats as $cat) {
-            $result[$cat]['children'] = get_nested_categories( $default, $cat);
+            //$result[$cat]['children'] = get_nested_categories( $default, $cat);
             $result[$cat]['cat_ID'] = $cat;
             $result[$cat]['checked'] = in_array( $cat, $checked_categories );
@@ -755 +740 @@
     }
 
-    $categories = get_terms('link_category', 'orderby=count');
+    $categories = get_terms('link_category', 'orderby=count&hide_empty=0');
     
     if ( empty($categories) )
@@ -773 +758 @@
         $categories = get_categories( 'hide_empty=0' );
 
-    $children = _get_category_hierarchy();
+    $children = _get_term_hierarchy('category');
 
     if ( $categories ) {
@@ -960 +945 @@
     if ( $categories ) {
         foreach ( $categories as $category ) {
-            if ( $currentcat != $category->cat_ID && $parent == $category->category_parent) {
+            if ( $currentcat != $category->term_id && $parent == $category->parent) {
                 $pad = str_repeat( '– ', $level );
-                $category->cat_name = wp_specialchars( $category->cat_name );
-                echo "\n\t<option value='$category->cat_ID'";
-                if ( $currentparent == $category->cat_ID )
+                $category->name = wp_specialchars( $category->name );
+                echo "\n\t<option value='$category->term_id'";
+                if ( $currentparent == $category->term_id )
                     echo " selected='selected'";
-                echo ">$pad$category->cat_name</option>";
-                wp_dropdown_cats( $currentcat, $currentparent, $category->cat_ID, $level +1, $categories );
+                echo ">$pad$category->name</option>";
+                wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
             }
         }