diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-10 11:53:05 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-10 11:53:05 +0000 |
| commit | a35bb9df8c7816a6facf68ff963d5350999befe4 (patch) | |
| tree | 938afe326a64560dcc79f2888c6fc97f848e2eaa /wp-admin/admin-functions.php | |
| parent | b27bbc0cfea92cfbbfd34a8e2f65b026086e99b2 (diff) | |
| download | wordpress-mu-a35bb9df8c7816a6facf68ff963d5350999befe4.tar.gz wordpress-mu-a35bb9df8c7816a6facf68ff963d5350999befe4.tar.xz wordpress-mu-a35bb9df8c7816a6facf68ff963d5350999befe4.zip | |
WP Merge to rev 4714
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@839 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-functions.php')
| -rw-r--r-- | wp-admin/admin-functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 6e0d177..7a33aca 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -600,7 +600,7 @@ function checked( $checked, $current) { 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 OR category_count != 0 ) ORDER BY category_count DESC" ); + return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( link_count = 0 OR category_count != 0 OR ( link_count = 0 AND category_count = 0 ) ) ORDER BY category_count DESC" ); } function sort_cats( $cat1, $cat2 ) { @@ -678,7 +678,7 @@ function dropdown_categories( $default = 0 ) { 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 OR link_count != 0) ORDER BY link_count DESC" ); + return $wpdb->get_col( "SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND ( category_count = 0 OR link_count != 0 OR ( link_count = 0 AND category_count = 0 ) ) ORDER BY link_count DESC" ); } function get_nested_link_categories( $default = 0, $parent = 0 ) { |