Merge branch 'master' of https://github.com/librenms/librenms into issue-2018

This commit is contained in:
laf
2015-10-11 19:32:40 +00:00
38 changed files with 6298 additions and 3324 deletions

View File

@ -30,10 +30,10 @@ if (!empty($ifName) && is_numeric($port_id)) {
if (dbUpdate(array('ifAlias'=>$descr), 'ports', '`port_id`=?', array($port_id)) > 0) {
$device = device_by_id_cache($device_id);
if ($descr === 'repoll') {
del_dev_attrib($device, 'ifName');
del_dev_attrib($device, 'ifName:'.$ifName);
}
else {
set_dev_attrib($device, 'ifName', $ifName);
set_dev_attrib($device, 'ifName:'.$ifName, 1);
}
$status = 'ok';
}