From 937937aa09a0c186c70a8dba64975f921eee111d Mon Sep 17 00:00:00 2001 From: pblasquez Date: Thu, 4 Feb 2016 16:10:28 -0800 Subject: [PATCH] Update core.inc.php --- includes/polling/core.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/polling/core.inc.php b/includes/polling/core.inc.php index ec23309a2..1af4e3b58 100644 --- a/includes/polling/core.inc.php +++ b/includes/polling/core.inc.php @@ -85,7 +85,7 @@ $poll_device['sysLocation'] = str_replace('"', '', $poll_device['sysLocation']); $poll_device['sysLocation'] = trim($poll_device['sysLocation'], '\\'); // Rewrite sysLocation if there is a mapping array (database too?) -if (!empty($poll_device['sysLocation']) && is_array($config['location_map'])) { +if (!empty($poll_device['sysLocation']) && (is_array($config['location_map']) || is_array($config['location_map_regex']))) { $poll_device['sysLocation'] = rewrite_location($poll_device['sysLocation']); }