Ticket #18828: 18828.diff

src/wp-includes/taxonomy.php

@@ -2627 +2627 @@
         }
 
         // tt_ids queries can only be none or tr.term_taxonomy_id
-        if ( ('tt_ids' == $fields) && !empty($orderby) )
+        if ( ( 'tt_ids' == $fields ) && !empty( $orderby ) )
                 $orderby = 'tr.term_taxonomy_id';
 
-        if ( !empty($orderby) )
+        if ( !empty( $orderby ) )
                 $orderby = "ORDER BY $orderby";
 
         $order = strtoupper( $order );
         if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) )
                 $order = 'ASC';
 
-        $taxonomies = "'" . implode("', '", $taxonomies) . "'";
-        $object_ids = implode(', ', $object_ids);
+        $_taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
+        $_object_ids = implode( ', ', $object_ids );
 
         $select_this = '';
         if ( 'all' == $fields ) {
@@ -2652 +2652 @@
         } elseif ( 'all_with_object_id' == $fields ) {
                 $select_this = 't.*, tt.*, tr.object_id';
         }
-        $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tr.object_id IN ($object_ids) $orderby $order";
+        $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($_taxonomies) AND tr.object_id IN ($_object_ids) $orderby $order";
 
         $objects = false;
         if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
@@ -2671 +2671 @@
                 }
                 $terms = array_merge( $terms, $_terms );
         } elseif ( 'tt_ids' == $fields ) {
-                $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order");
+                $terms = $wpdb->get_col( "SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($_object_ids) AND tt.taxonomy IN ($_taxonomies) $orderby $order" );
                 foreach ( $terms as $key => $tt_id ) {
                         $terms[$key] = sanitize_term_field( 'term_taxonomy_id', $tt_id, 0, $taxonomy, 'raw' ); // 0 should be the term id, however is not needed when using raw context.
                 }