Changeset 5590

Timestamp:

05/29/2007 04:54:45 AM (16 years ago)

Author:

markjaquith

Message:

switch to term_id and name for category sorting. see #4189. sort by term_id for category permalinks, by name for get_the_category(). fixes #4335 for trunk. Props Erik Barzeski for the find.

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (2 diffs)
• link-template.php (modified) (1 diff)

trunk/wp-includes/category-template.php

@@ -70 +70 @@
 
     if ( !empty($categories) )
-        usort($categories, '_get_the_category_usort');
+        usort($categories, '_usort_terms_by_name');
     else
         $categories = array();
@@ -77 +77 @@
 }
 
-function _get_the_category_usort($a, $b) {
-    return strcmp($a->category_name, $b->category_name);
+function _usort_terms_by_name($a, $b) {
+    return strcmp($a->name, $b->name);
+}
+
+function _usort_terms_by_ID($a, $b) { 
+    if ( $a->term_id > $b->term_id ) 
+        return 1; 
+    elseif ( $a->term_id < $b->term_id ) 
+        return -1; 
+    else 
+        return 0; 
 }
 

trunk/wp-includes/link-template.php

@@ -74 +74 @@
         if (strpos($permalink, '%category%') !== false) {
             $cats = get_the_category($post->ID);
+            if ( $cats )
+                usort($cats, '_usort_terms_by_ID'); // order by ID
             $category = $cats[0]->slug;
             if ( $parent=$cats[0]->parent )