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

Timestamp:

04/05/2007 09:16:02 PM (18 years ago)

Author:

ryan

Message:

Bit twiddling. Add type bitfield to categories table. see #3723

File:

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

trunk/wp-admin/admin-functions.php

@@ -648 +648 @@
 function return_categories_list( $parent = 0 ) {
     global $wpdb;
-    return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( ( link_count = 0 AND tag_count = 0 ) OR category_count != 0 OR ( link_count = 0 AND category_count = 0 AND tag_count = 0 ) ) ORDER BY category_count DESC" );
+    return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( type & " . TAXONOMY_CATEGORY . " != 0 ) AND ( link_count = 0 OR category_count != 0 ) ORDER BY category_count DESC" );
 }
 
@@ -745 +745 @@
 function return_link_categories_list( $parent = 0 ) {
     global $wpdb;
-    return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( ( category_count = 0 AND tag_count = 0 ) OR link_count != 0 OR ( link_count = 0 AND category_count = 0 AND tag_count = 0 ) ) ORDER BY link_count DESC" );
+    return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( type & " . TAXONOMY_CATEGORY . " != 0 ) AND ( category_count = 0 OR link_count != 0 ) ORDER BY link_count DESC" );
 }