From bea4422bdcb77476f0960e588ba948b57e244d28 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 9 Aug 2015 11:49:41 -0400 Subject: [PATCH] Enforce the language on the JOIN, not the WHERE --- inc/common.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/inc/common.inc.php b/inc/common.inc.php index e75d5408..8fe783c0 100644 --- a/inc/common.inc.php +++ b/inc/common.inc.php @@ -1962,10 +1962,11 @@ function mfh_getDisplayTextForStatusId($statusId) { $statusRs = hesk_dbQuery("SELECT `text`, `Key`, `language` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` AS `statuses` LEFT JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."text_to_status_xref` ON `status_id` = `statuses`.`ID` - WHERE `statuses`.`ID` = ".intval($statusId)." AND `language` = '".hesk_dbEscape($hesk_settings['language'])."'"); + AND `language` = '".hesk_dbEscape($hesk_settings['language'])."' + WHERE `statuses`.`ID` = ".intval($statusId)); $statusRec = hesk_dbFetchAssoc($statusRs); - if ($statusRec['language'] == $hesk_settings['language'] && $statusRec['text'] != NULL) { + if ($statusRec['text'] != NULL) { // We found a record. Use the text field return $statusRec['text']; } else {