From ba96e5c5cc351be1a2e9aacbac1d1eccb32d3ed0 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Thu, 31 Mar 2011 17:35:09 +0000 Subject: [PATCH] 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 --- CHANGELOG | 1 + html/includes/functions.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index c12665573..75208fa4e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 ) diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index fe27969ec..606fac8d6 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -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']; } } }