From c94784f3dd62248b6e6b28c2628aa5f4ba06d6df Mon Sep 17 00:00:00 2001 From: f0o Date: Sun, 12 Apr 2015 14:37:26 +0000 Subject: [PATCH] honour alert_rules.disabled --- 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 60f877b40f..aa5c8687ce 100644 --- a/includes/alerts.inc.php +++ b/includes/alerts.inc.php @@ -68,7 +68,7 @@ function GetRules($device) { $where .= " || alert_map.target = ?"; $params[] = 'g'.$group; } - 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); + return dbFetchRows('SELECT alert_rules.* FROM alert_rules LEFT JOIN alert_map ON alert_rules.id=alert_map.rule WHERE alert_rules.disabled = 0 && ( (alert_rules.device_id = -1 || alert_rules.device_id = ? ) || alert_map.target = ? '.$where.' )',$params); } /**