fix to remove duplicate overridden locations, add to CHANGELOG

git-svn-id: http://www.observium.org/svn/observer/trunk@2002 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-31 17:35:09 +00:00
parent 98fdba559a
commit ba96e5c5cc
2 changed files with 2 additions and 1 deletions

View File

@ -26,6 +26,7 @@ SVN 0.10-current
* Add a new discovery parameter to only discover new devices, this can be run every 5 minutes
to speed up discovery of added devices through the webinterface
* Make a distinction between 'ignore' and 'disable' for ports, like for devices
* Allow overriding sysLocation and sysContact
Release 0.10.7.1 ( 19th July 2010 )

View File

@ -368,7 +368,7 @@ function getlocations()
# We can do this because of the ORDER BY, "bool" will be handled before "string"
elseif ($row['attrib_type'] == 'override_sysLocation_string' && $ignore_dev_location[$row['device_id']] == 1)
{
if (!in_array($row['location'],$locations)) { $locations[] = $row['attrib_value']; }
if (!in_array($row['attrib_value'],$locations)) { $locations[] = $row['attrib_value']; }
}
}