Fix issue where warning is displayed that CAT data from radio is out of date due to using default timezone
这个提交包含在:
父节点
7315ae23db
当前提交
2cbb2522ba
共有 2 个文件被更改,包括 4 次插入 和 4 次删除
|
|
@ -32,7 +32,7 @@
|
|||
// user is not logged in
|
||||
redirect('user/login');
|
||||
}
|
||||
|
||||
|
||||
$this->load->model('cat');
|
||||
$query = $this->cat->status();
|
||||
if ($query->num_rows() > 0)
|
||||
|
|
@ -138,8 +138,8 @@
|
|||
}
|
||||
|
||||
// Calculate how old the data is in minutes
|
||||
$datetime1 = new DateTime(); // Today's Date/Time
|
||||
$datetime2 = new DateTime($row->newtime);
|
||||
$datetime1 = new DateTime("now", new DateTimeZone('UTC')); // Today's Date/Time
|
||||
$datetime2 = new DateTime($row->timestamp, new DateTimeZone('UTC'));
|
||||
$interval = $datetime1->diff($datetime2);
|
||||
|
||||
$minutes = $interval->days * 24 * 60;
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@
|
|||
}
|
||||
|
||||
function radio_status($id) {
|
||||
$sql = 'SELECT *, CONVERT_TZ(`timestamp`, @@session.time_zone, \'+00:00\' ) as newtime FROM `cat` WHERE id = ' . $id . ' and user_id =' . $this->session->userdata('user_id');
|
||||
$sql = 'SELECT * FROM `cat` WHERE id = ' . $id . ' and user_id =' . $this->session->userdata('user_id');
|
||||
return $this->db->query($sql);
|
||||
}
|
||||
|
||||
|
|
|
|||
正在加载…
在新工单中引用