Ticket #7815: 7815.diff

inc/search.php

@@ -81 +81 @@
                 if ( self::is_search( $query ) ) {
                         $join .= "
                                 LEFT JOIN
-                                  {$wpdb->term_relationships} ON {$wpdb->posts}.ID = {$wpdb->term_relationships}.object_id
+                                  {$wpdb->term_relationships} AS tr_search ON {$wpdb->posts}.ID = tr_search.object_id
                                 LEFT JOIN
-                                  {$wpdb->term_taxonomy} ON {$wpdb->term_taxonomy}.term_taxonomy_id = {$wpdb->term_relationships}.term_taxonomy_id
+                                  {$wpdb->term_taxonomy} AS tt_search ON tt_search.term_taxonomy_id = tr_search.term_taxonomy_id
                                 LEFT JOIN
-                                  {$wpdb->terms} ON {$wpdb->terms}.term_id = {$wpdb->term_taxonomy}.term_id
+                                  {$wpdb->terms} AS t_search ON t_search.term_id = tt_search.term_id
                           ";
                 }
 
@@ -131 +131 @@
                         if ( $insert_at ) {
                                 $or_tag = $wpdb->prepare( "OR
                                         (
-                                                {$wpdb->term_taxonomy}.taxonomy = %s
+                                                tt_search.taxonomy = %s
                                                 AND
-                                                {$wpdb->terms}.name = %s
+                                                t_search.name = %s
                                         ) ",
                                         Registrations::get_taxonomy( 'tags' ),
                                         get_query_var('s')