From 7951ad44d0e3dc71429f57365c37d2f33132a710 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Mon, 20 Jul 2015 17:49:17 +0100
Subject: [PATCH] Stop updating device when override is set

---
 includes/polling/system.inc.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/includes/polling/system.inc.php b/includes/polling/system.inc.php
index e0be94370..700f7046d 100644
--- a/includes/polling/system.inc.php
+++ b/includes/polling/system.inc.php
@@ -114,11 +114,9 @@ foreach (array('sysContact', 'sysObjectID', 'sysName', 'sysDescr') as $elem) {
     }
 }
 
-if ($poll_device['sysLocation'] && $device['location'] != $poll_device['sysLocation']) {
-    if (!get_dev_attrib($device, 'override_sysLocation_bool')) {
-        $update_array['location'] = $poll_device['sysLocation'];
-        log_event('Location -> '.$poll_device['sysLocation'], $device, 'system');
-    }
+if ($poll_device['sysLocation'] && $device['location'] != $poll_device['sysLocation'] && $device['override_sysLocation'] == 0) {
+    $update_array['location'] = $poll_device['sysLocation'];
+    log_event('Location -> '.$poll_device['sysLocation'], $device, 'system');
 }
 
 if ($config['geoloc']['latlng'] === true) {