Merge pull request #2476 from laf/device-groups

Strip && and || from query for alerts in polling

includes/device-groups.inc.php

@@ -47,6 +47,9 @@ function GenGroupSQL($pattern, $search='') {
         }
     }
 
+    $pattern = rtrim($pattern, '&&');
+    $pattern = rtrim($pattern, '||');
+
     $tables = array_keys(array_flip($tables));
     $x      = sizeof($tables);
     $i      = 0;