WP Merge to rev 4904

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

1 files changed, 5 insertions, 1 deletions

diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index fed3043..0fd33bb 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -74,13 +74,17 @@ global $post, $category_cache, $blog_id;
 	$categories = $category_cache[$blog_id][$id];
 
 	if ( !empty($categories) )
-		sort($categories);
+		usort($categories, '_get_the_category_usort');
 	else
 		$categories = array();
 
 	return $categories;
 }
 
+function _get_the_category_usort($a, $b) {
+	return strcmp($a->category_name, $b->category_name);
+}
+
 function get_the_category_by_ID($cat_ID) {
 	$cat_ID = (int) $cat_ID;
 	$category = &get_category($cat_ID);