Ticket #34996: 34996.diff

taxonomy.php

@@ -1354 +1354 @@
         // Meta query support.
         $join = '';
         if ( ! empty( $args['meta_query'] ) ) {
-                $mquery = new WP_Meta_Query( $args['meta_query'] );
+                
+                $mquery = new WP_Meta_Query( $args['meta_query'] );             
                 $mq_sql = $mquery->get_sql( 'term', 't', 'term_id' );
 
                 $join  .= $mq_sql['join'];
                 $where .= $mq_sql['where'];
+                
+                // extract clauses
+                $meta_clauses = $mquery->get_clauses();
+                if ( ! empty( $meta_clauses ) ) {
+                        $allowed_keys = array();
+                        $primary_meta_query = reset( $meta_clauses );
+                        if ( ! empty( $primary_meta_query['key'] ) ) {
+                                $primary_meta_key = $primary_meta_query['key'];
+                                $allowed_keys[] = $primary_meta_key;
+                        }
+                        $allowed_keys[] = 'meta_value';
+                        $allowed_keys[] = 'meta_value_num';
+                        $allowed_keys = array_merge( $allowed_keys, array_keys( $meta_clauses ) );
+                        $orderby = ( isset( $args['orderby'] ) ) ? $args['orderby'] : '';
+                        if( in_array( $orderby, $allowed_keys ) ) {
+                                $join .= " INNER JOIN $wpdb->termmeta AS term_meta ON t.term_id = term_meta.term_id";
+                                switch( $orderby ) {
+                                        default:
+                                        case $primary_meta_key:
+                                        case 'meta_value':
+                                                if ( ! empty( $primary_meta_query['type'] ) ) {
+                                                        $orderby = "ORDER BY CAST(term_meta.meta_value AS term_meta)";
+                                                } else {
+                                                        $orderby = "ORDER BY term_meta.meta_value";
+                                                }
+                                                break;
+                                        case 'meta_value_num':
+                                                $orderby = "ORDER BY term_meta.meta_value+0";
+                                                break;
+                                }
+                        }
+                }
+                
         }
 
         $selects = array();
@@ -1420 +1454 @@
          * @param array $args       An array of terms query arguments.
          */
         $clauses = apply_filters( 'terms_clauses', compact( $pieces ), $taxonomies, $args );
-
+        
         $fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
         $join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
         $where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';