diff options
| author | Andrejs Verza <andrejs.verza@zabbix.com> | 2022-03-07 15:53:35 +0300 |
|---|---|---|
| committer | Andrejs Verza <andrejs.verza@zabbix.com> | 2022-03-07 17:41:04 +0300 |
| commit | 701e98671d8ec71fb60cf4f7a12630e469c809c2 (patch) | |
| tree | 4792a702f9d9998333658f702fef935312c93f71 /ui/app/controllers/CControllerTokenEdit.php | |
| parent | e3b8d15622633521bed8056b38667be926ca43b4 (diff) | |
..F....... [ZBX-19583] unified date format across datepickers
Merge in ZBX/zabbix from feature/ZBX-19583-6.0 to release/6.0
* commit 'aee2b261169543db8c3562e54e5fb64e4269e6cf':
.......... [ZBX-19583] updated unit tests
..F....... [ZBX-19583] added uint64 input validation rule
..F....... [ZBX-19583] fixed typos
..F....... [ZBX-19583] fixed undefined index errors in forged requests
..F....... [ZBX-19583] fixed absolute time parser
.......... [ZBX-19583] added new test cases for CAbsoluteTimeParser class
.......... [ZBX-19583] added new test cases for CValidationRule class
..F....... [ZBX-19583] unified date format across datepickers
(cherry picked from commit 6519662e85d65e77fbd74360837610241c9d6630)
Diffstat (limited to 'ui/app/controllers/CControllerTokenEdit.php')
| -rw-r--r-- | ui/app/controllers/CControllerTokenEdit.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/controllers/CControllerTokenEdit.php b/ui/app/controllers/CControllerTokenEdit.php index 405a44d822a..608a96920b5 100644 --- a/ui/app/controllers/CControllerTokenEdit.php +++ b/ui/app/controllers/CControllerTokenEdit.php @@ -69,7 +69,7 @@ class CControllerTokenEdit extends CController { $data = $tokens[0]; if ($data['expires_at'] != 0) { - $data['expires_at'] = date(DATE_TIME_FORMAT_SECONDS, (int) $data['expires_at']); + $data['expires_at'] = date(ZBX_FULL_DATE_TIME, (int) $data['expires_at']); $data['expires_state'] = '1'; } else { |