Ticket #6410: patch-for-ticket-6410

Index: query.php
===================================================================
--- query.php   (revision 7565)
+++ query.php   (working copy)
@@ -973,9 +973,11 @@
                        }
                        $n = ($q['exact']) ? '' : '%';
                        $searchand = '';
+                       // Add a COLLATE statement to the searches if a special collation is defined
+                       if ($wpdb->collate) $collatesql = ' COLLATE ' . $wpdb->collate;
                        foreach((array)$q['search_terms'] as $term) {
                                $term = addslashes_gpc($term);
-                               $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
+                               $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}'$collatesql) OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'$collatesql))";
                                $searchand = ' AND ';
                        }
                        $term = $wpdb->escape($q['s']);