Changeset 5560

Timestamp:

05/27/2007 05:21:04 PM (16 years ago)

Author:

ryan

Message:

Link category fixes. see #4189

Location:

trunk

Files:

• wp-admin/includes/bookmark.php (modified) (1 diff)
• wp-includes/bookmark-template.php (modified) (1 diff)
• wp-includes/bookmark.php (modified) (2 diffs)
• wp-includes/category.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-admin/includes/bookmark.php

@@ -54 +54 @@
 function wp_get_link_cats($link_id = 0) {
 
-    $cats = get_object_terms($link_id, 'link_category', 'get=ids');
+    $cats = get_object_terms($link_id, 'link_category', 'fields=ids');
 
     return array_unique($cats);

trunk/wp-includes/bookmark-template.php

@@ -334 +334 @@
     if ( $categorize ) {
         //Split the bookmarks into ul's for each category
-        $cats = get_categories("type=link&category_name=$category_name&include=$category&orderby=$category_orderby&order=$category_order&hierarchical=0");
+        $cats = get_terms('link_category', "category_name=$category_name&include=$category&orderby=$category_orderby&order=$category_order&hierarchical=0");
 
         foreach ( (array) $cats as $cat ) {

trunk/wp-includes/bookmark.php

@@ -77 +77 @@
 
     if ( ! empty($category_name) ) {
-        if ( $cat_id = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$category_name' LIMIT 1") )
-            $category = $cat_id;
+        if ( $category = get_term_by('name', $category_name, 'link_category') );
+            $category = $category->term_id;
     }
 
@@ -88 +88 @@
             foreach ( $incategories as $incat ) {
                 if (empty($category_query))
-                    $category_query = ' AND ( category_id = ' . intval($incat) . ' ';
+                    $category_query = ' AND ( tt.term_id = ' . intval($incat) . ' ';
                 else
-                    $category_query .= ' OR category_id = ' . intval($incat) . ' ';
+                    $category_query .= ' OR tt.term_id = ' . intval($incat) . ' ';
             }
         }
     }
     if (!empty($category_query)) {
-        $category_query .= ')';
-        $join = " LEFT JOIN $wpdb->link2cat ON ($wpdb->links.link_id = $wpdb->link2cat.link_id) ";
+        $category_query .= ") AND taxonomy = 'link_category'";
+        $join = " LEFT JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) LEFT JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
     }
 

trunk/wp-includes/category.php

@@ -14 +14 @@
 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);
 }

trunk/wp-includes/taxonomy.php

@@ -243 +243 @@
 
 function wp_update_term_count( $terms, $taxonomy ) {
+    global $wpdb;
+
     if ( empty($terms) )
         return false;