holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Notifications: Fix notifications displayed time was not base on user timezone

Browse Source
This commit is contained in:
Hadi Nategh 2020-08-28 11:59:37 +02:00
parent 6b5414904f
commit 10f40c9dbb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
notifications/inc/class.notifications_ajax.inc.php
View File

@ -210,8 +210,8 @@ class notifications_ajax {
'id' => $notification['notify_id'], 'id' => $notification['notify_id'],
'message' => $notification['notify_message'], 'message' => $notification['notify_message'],
'status' => $notification['notify_status'], 'status' => $notification['notify_status'],
'created' => Api\DateTime::to($notification['notify_created']), 'created' => Api\DateTime::server2user($notification['notify_created']),
'current' => new DateTime(), 'current' => new Api\DateTime('now'),
'actions' => is_array($actions)?$actions:NULL, 'actions' => is_array($actions)?$actions:NULL,
'extra_data' => ($data['data'] ? $data['data'] : array()) 'extra_data' => ($data['data'] ? $data['data'] : array())
); );

4
notifications/inc/class.notifications_popup.inc.php
View File

@ -161,8 +161,8 @@ class notifications_popup implements notifications_iface {
'id' => $notification['notify_id'], 'id' => $notification['notify_id'],
'message' => $notification['notify_message'], 'message' => $notification['notify_message'],
'status' => $notification['notify_status'], 'status' => $notification['notify_status'],
'created' => Api\DateTime::to($notification['notify_created']), 'created' => Api\DateTime::server2user($notification['notify_created']),
'current' => new DateTime(), 'current' => new Api\DateTime('now'),
'actions' => is_array($actions)?$actions:NULL, 'actions' => is_array($actions)?$actions:NULL,
'extra_data' => ($data['data'] ? $data['data'] : array()) 'extra_data' => ($data['data'] ? $data['data'] : array())
); );