Changeset 5642

Timestamp:

06/03/2007 05:28:27 PM (17 years ago)

Author:

ryan

Message:

Fix link category dropdown and filter. Add some back compat to get_categories. see #4189

Location:

trunk

Files:

• wp-admin/link-manager.php (modified) (1 diff)
• wp-includes/category.php (modified) (1 diff)

trunk/wp-admin/link-manager.php

@@ -77 +77 @@
 <form id="cats" method="get" action="">
 <p><?php
-$categories = get_categories("hide_empty=1&type=link");
+$categories = get_terms('link_category', "hide_empty=1");
 $select_cat = "<select name=\"cat_id\">\n";
 $select_cat .= '<option value="all"'  . (($cat_id == 'all') ? " selected='selected'" : '') . '>' . __('All') . "</option>\n";
 foreach ((array) $categories as $cat)
-    $select_cat .= '<option value="' . $cat->cat_ID . '"' . (($cat->cat_ID == $cat_id) ? " selected='selected'" : '') . '>' . wp_specialchars(apply_filters('link_category', $cat->cat_name)) . "</option>\n";
+    $select_cat .= '<option value="' . $cat->term_id . '"' . (($cat->term_id == $cat_id) ? " selected='selected'" : '') . '>' . wp_specialchars(apply_filters('link_category', $cat->name)) . "</option>\n";
 $select_cat .= "</select>\n";
 

trunk/wp-includes/category.php

@@ -13 +13 @@
 
 function &get_categories($args = '') {
-    // TODO Add back compat fields into each object.
-    // Set taxonomy to link_category if type=link
-    return get_terms('category', $args);
+    $defaults = array('type' => 'category');
+    $args = wp_parse_args($args, $defaults);
+
+    $taxonomy = 'category';
+    if ( 'link' == $args['type'] )
+        $taxonomy = 'link_category';
+    return get_terms($taxonomy, $args);
 }