diff options
| author | Reinis Detlavs <reinis.detlavs@zabbix.com> | 2022-04-12 11:18:55 +0300 |
|---|---|---|
| committer | Reinis Detlavs <reinis.detlavs@zabbix.com> | 2022-04-12 11:18:55 +0300 |
| commit | 2f0778be2acb783609b59f93531ded1dfb305555 (patch) | |
| tree | 1221d0d070a4c0b72ae478e0ab1f207d8a1173ad | |
| parent | 5368cec46b11f687c436ee250ae8e62782830db5 (diff) | |
| parent | a5967636f41919ae7ea772984992074fff316ad1 (diff) | |
..F....... [ZBXNEXT-7564] fixed media type importing in PHP 8
* commit 'a5967636f41919ae7ea772984992074fff316ad1':
..F....... [ZBXNEXT-7564] fixed media type importing in PHP 8
| -rw-r--r-- | ChangeLog.d/feature/ZBXNEXT-7564 | 1 | ||||
| -rw-r--r-- | ui/include/classes/api/services/CMediatype.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog.d/feature/ZBXNEXT-7564 b/ChangeLog.d/feature/ZBXNEXT-7564 new file mode 100644 index 00000000000..ec5e5a1af0a --- /dev/null +++ b/ChangeLog.d/feature/ZBXNEXT-7564 @@ -0,0 +1 @@ +..F....... [ZBXNEXT-7564] fixed media type importing in PHP 8 (rdetlavs) diff --git a/ui/include/classes/api/services/CMediatype.php b/ui/include/classes/api/services/CMediatype.php index b1a0daecd24..a7ca68ebad5 100644 --- a/ui/include/classes/api/services/CMediatype.php +++ b/ui/include/classes/api/services/CMediatype.php @@ -623,7 +623,7 @@ class CMediatype extends CApiService { 'exec_params' => ['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'exec_params')], 'content_type' => ['type' => API_INT32, 'in' => DB::getDefault('media_type', 'content_type')], 'script' => ['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'script')], - 'timeout' => ['type' => API_TIME_UNIT, 'in' => DB::getDefault('media_type', 'timeout')], + 'timeout' => ['type' => API_TIME_UNIT, 'in' => timeUnitToSeconds(DB::getDefault('media_type', 'timeout'))], 'process_tags' => ['type' => API_INT32, 'in' => DB::getDefault('media_type', 'process_tags')], 'show_event_menu' => ['type' => API_INT32, 'in' => DB::getDefault('media_type', 'show_event_menu')], 'event_menu_url' => ['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'event_menu_url')], |