dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Messages: Additional check on presence of time_zone setting.

Browse Source
This commit is contained in:
Nate
2019-12-02 14:51:56 -07:00
parent f186d1ee9f
commit 6263fd7a0a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/messages/messages_thread.php
+9 -2
View File
@@ -67,7 +67,12 @@
$sql .= "contact_uuid, "; $sql .= "contact_uuid, ";
$sql .= "message_type, "; $sql .= "message_type, ";
$sql .= "message_direction, "; $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_from, ";
$sql .= "message_to, "; $sql .= "message_to, ";
$sql .= "message_text "; $sql .= "message_text ";
@@ -78,7 +83,9 @@
$sql .= "and (message_from like :message_number or message_to like :message_number) "; $sql .= "and (message_from like :message_number or message_to like :message_number) ";
$sql .= "order by message_date desc "; $sql .= "order by message_date desc ";
$sql .= $limit; $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['user_uuid'] = $_SESSION['user_uuid'];
$parameters['domain_uuid'] = $domain_uuid; $parameters['domain_uuid'] = $domain_uuid;
$parameters['message_number'] = '%'.$number; $parameters['message_number'] = '%'.$number;