From 6263fd7a0a333a1d7897f1791d717f52149dffe6 Mon Sep 17 00:00:00 2001 From: Nate Date: Mon, 2 Dec 2019 14:51:56 -0700 Subject: [PATCH] Messages: Additional check on presence of time_zone setting. --- app/messages/messages_thread.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/messages/messages_thread.php b/app/messages/messages_thread.php index 286b667975..2298471138 100644 --- a/app/messages/messages_thread.php +++ b/app/messages/messages_thread.php @@ -67,7 +67,12 @@ $sql .= "contact_uuid, "; $sql .= "message_type, "; $sql .= "message_direction, "; - $sql .= "message_date at time zone :time_zone as message_date, "; + if ($_SESSION['domain']['time_zone']['name'] != '') { + $sql .= "message_date at time zone :time_zone as message_date, "; + } + else { + $sql .= "message_date, "; + } $sql .= "message_from, "; $sql .= "message_to, "; $sql .= "message_text "; @@ -78,7 +83,9 @@ $sql .= "and (message_from like :message_number or message_to like :message_number) "; $sql .= "order by message_date desc "; $sql .= $limit; - $parameters['time_zone'] = $_SESSION['domain']['time_zone']['name']; + if ($_SESSION['domain']['time_zone']['name'] != '') { + $parameters['time_zone'] = $_SESSION['domain']['time_zone']['name']; + } $parameters['user_uuid'] = $_SESSION['user_uuid']; $parameters['domain_uuid'] = $domain_uuid; $parameters['message_number'] = '%'.$number;