WP Merge to rev 4714

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@839 7be80a69-a1ef-0310-a953-fb0f7c49ff36

4 files changed, 6 insertions, 6 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 ) {
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 38b07ca..6afe8d2 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -429,8 +429,8 @@ function wp_list_cats($args = '') {
 		$r['show_last_update'] = $r['optiondates'];

 	if ( isset($r['optioncount']) )

 		$r['show_count'] = $r['optioncount'];

-	if ( !empty($r['list']) )

-		$r['style'] = 'break';

+	if ( isset($r['list']) )

+		$r['style'] = $r['list'] ? 'list' : 'break';

 	$r['title_li'] = '';

 

 	return wp_list_categories($r);

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index d1ec74c..26b8158 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -288,7 +288,7 @@ function remove_accents($string) {
 	return $string;
 }
 
-function sanitize_file( $name ) { // Like sanitize_title, but with periods
+function sanitize_file_name( $name ) { // Like sanitize_title, but with periods
 	$name = strtolower( $name );
 	$name = preg_replace('/&.+?;/', '', $name); // kill entities
 	$name = str_replace( '_', '-', $name );
diff --git a/xmlrpc.php b/xmlrpc.php
index 15f3276..d7f0825 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -846,7 +846,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		$user_pass   = $wpdb->escape($args[2]);
 		$data        = $args[3];
 
-		$name = sanitize_file( $data['name'] );
+		$name = sanitize_file_name( $data['name'] );
 		$type = $data['type'];
 		$bits = $data['bits'];