diff options
| author | Gregory Chalenko <gregory.chalenko@zabbix.com> | 2020-10-07 17:23:18 +0300 |
|---|---|---|
| committer | Gregory Chalenko <gregory.chalenko@zabbix.com> | 2020-10-07 17:23:18 +0300 |
| commit | 247b305eae06839c383ec69077c04f1b8d2bf257 (patch) | |
| tree | 84c730a200edacb04634e60ef9c45aa38873a3e5 /ui/app/controllers/CControllerHost.php | |
| parent | 345acf85f3e564d9cb657993280017146bb75143 (diff) | |
| parent | c9b884b8439aaa8a831b4cfba810d9ddfa514e7e (diff) | |
.......... [ZBXNEXT-710] merged from latest master; fixed conflicts in:
- ui/include/defines.inc.php
- src/libs/zbxdbupgrade/dbupgrade_5010.c
- create/src/schema.tmpl
Diffstat (limited to 'ui/app/controllers/CControllerHost.php')
| -rw-r--r-- | ui/app/controllers/CControllerHost.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php index 2a72c52ecea..5d4d1e99510 100644 --- a/ui/app/controllers/CControllerHost.php +++ b/ui/app/controllers/CControllerHost.php @@ -106,7 +106,7 @@ abstract class CControllerHost extends CController { * @param string $filter['evaltype'] Filter hosts by tags. * @param string $filter['tags'] Filter hosts by tag names and values. * @param string $filter['severities'] Filter problems on hosts by severities. - * @param string $filter['show_suppressed'] Filter supressed problems. + * @param string $filter['show_suppressed'] Filter suppressed problems. * @param int $filter['maintenance_status'] Filter hosts by maintenance. * @param int $filter['page'] Page number. * @param string $filter['sort'] Sorting field. @@ -153,7 +153,7 @@ abstract class CControllerHost extends CController { // Split result array and create paging. $paging = CPagerHelper::paginate($filter['page'], $hosts, $filter['sortorder'], $view_curl); - // Get additonal data to limited host amount. + // Get additional data to limited host amount. $hosts = API::Host()->get([ 'output' => ['hostid', 'name', 'status', 'maintenance_status', 'maintenanceid', 'maintenance_type', 'available', 'snmp_available', 'jmx_available', 'ipmi_available', 'error', 'ipmi_error', 'snmp_error', |