From 112f8eb2f9b51a58d04f796e5f91b6ac4cb92149 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 12 Mar 2015 16:33:28 +0100 Subject: [PATCH] Remove COLLATE from host_name and service_description in the Contactgroup query refs #8614 refs #8613 --- .../Monitoring/Backend/Ido/Query/ContactgroupQuery.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php index c19670e8d..cf1586626 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php @@ -33,13 +33,13 @@ class ContactgroupQuery extends IdoQuery 'contact_notify_host_downtime' => 'c.notify_host_downtime', ), 'hosts' => array( - 'host' => 'ho.name1', + 'host' => 'ho.name1 COLLATE latin1_general_ci', 'host_name' => 'ho.name1' ), 'services' => array( 'service' => 'so.name2 COLLATE latin1_general_ci', - 'service_description' => 'so.name2 COLLATE latin1_general_ci', - 'service_host_name' => 'so.name1 COLLATE latin1_general_ci' + 'service_description' => 'so.name2', + 'service_host_name' => 'so.name1' ) );