Merge pull request #1501 from laf/issue-1334-new

New overview page and new map
This commit is contained in:
Paul Gear
2015-07-26 14:33:34 +10:00
220 changed files with 92463 additions and 57 deletions
-4
View File
@@ -296,10 +296,6 @@ function device_by_id_cache($device_id, $refresh = '0') {
}
else {
$device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = ?", array($device_id));
if (get_dev_attrib($device,'override_sysLocation_bool')) {
$device['real_location'] = $device['location'];
$device['location'] = get_dev_attrib($device,'override_sysLocation_string');
}
$cache['devices']['id'][$device_id] = $device;
}
return $device;