Changeset 18354

Timestamp:

06/27/2011 09:35:13 PM (10 years ago)

Author:

ryan

Message:

Sanitize order and orderby in get_terms(). For 3.1

Location:

branches/3.1

Files:

• . (modified) (1 prop)
• 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) . "')";