Changeset 38099 for trunk/src/wp-includes/class-wp-term-query.php

Timestamp:

07/19/2016 02:12:48 AM (10 years ago)

Author:

boonebgorges

Message:

Taxonomy: Improve back compat of values passed to 'terms_clauses' filter.

Prior to the introduction of WP_Term_Query, the 'orderby' clause
passed to the 'terms_clauses' filter was prefixed by ORDER BY. After
WP_Term_Query, this was not the case; ORDER BY was added after the
filter. As such, plugins filtering 'terms_clauses' and returning an
'orderby' clause beginning with ORDER BY resulted in invalid syntax
when WP_Term_Query prepended a second ORDER BY keyword to
the clause.

This changeset rearranges the way the 'orderby' clause is built so that
it will be passed to 'terms_clauses' in the previous format.

Fixes #37378.

File:

• trunk/src/wp-includes/class-wp-term-query.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-term-query.php

@@ -385 +385 @@
 
         $orderby = $this->parse_orderby( $this->query_vars['orderby'] );
+        if ( $orderby ) {
+            $orderby = "ORDER BY $orderby";
+        }
+
         $order = $this->parse_order( $this->query_vars['order'] );
 
@@ -619 +623 @@
         $this->sql_clauses['select']  = "SELECT $distinct $fields";
         $this->sql_clauses['from']    = "FROM $wpdb->terms AS t $join";
-        $this->sql_clauses['orderby'] = $orderby ? "ORDER BY $orderby $order" : '';
+        $this->sql_clauses['orderby'] = $orderby ? "$orderby $order" : '';
         $this->sql_clauses['limits']  = $limits;