From 1ac5c9228012f53a309f5210be0fac78acb8fbbc Mon Sep 17 00:00:00 2001 From: f0o Date: Sat, 4 Apr 2015 13:33:19 +0000 Subject: [PATCH] Fixed SQL bug --- includes/alerts.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/alerts.inc.php b/includes/alerts.inc.php index accdd09a96..99ff66571d 100644 --- a/includes/alerts.inc.php +++ b/includes/alerts.inc.php @@ -67,7 +67,7 @@ function GetRules($device) { $where .= " || alert_map.target = ?"; $params[] = 'g'.$group; } - return dbFetchRows('SELECT alert_rules.* FROM alert_rules,alert_map WHERE (alert_rules.device_id = -1 || alert_rules.device_id = ? ) || ( alert_rules.id=alert_map.rule && ( alert_map.target = ? '.$where.' ) )',$params); + return dbFetchRows('SELECT alert_rules.* FROM alert_rules LEFT JOIN alert_map ON alert_rules.id=alert_map.rule WHERE (alert_rules.device_id = -1 || alert_rules.device_id = ? ) || ( alert_map.target = ? '.$where.' )',$params); } /**