Changes in branches/3.1/wp-includes/taxonomy.php [18021:18354]

File:

• branches/3.1/wp-includes/taxonomy.php (modified) (2 diffs)

branches/3.1/wp-includes/taxonomy.php

@@ -1195 +1195 @@
         elseif ( empty($_orderby) || 'id' == $_orderby )
                 $orderby = 't.term_id';
+        else
+                $orderby = 't.name';
 
         $orderby = apply_filters( 'get_terms_orderby', $orderby, $args );
@@ -1202 +1204 @@
         else
                 $order = '';
+
+        $order = strtoupper( $order );
+        if ( '' !== $order && !in_array( $order, array( 'ASC', 'DESC' ) ) )
+                $order = 'ASC';
 
         $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";