tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-04-08 17:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix that DbQuery::renderFilter produces invalid filters

Browse Source 
fixes #7749
This commit is contained in:
Johannes Meyer 2014-11-20 11:58:22 +01:00
parent 4e87d21726
commit 38957e340b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Icinga/Data/Db/DbQuery.php
View File

@ -162,7 +162,10 @@ class DbQuery extends SimpleQuery
$parts = array(); $parts = array();
if (! $filter->isEmpty()) { if (! $filter->isEmpty()) {
foreach ($filter->filters() as $f) { foreach ($filter->filters() as $f) {
$parts[] = $this->renderFilter($f, $level + 1); $filterPart = $this->renderFilter($f, $level + 1);
if ($filterPart !== '') {
$parts[] = $filterPart;
}
} }
if ($level > 0) { if ($level > 0) {
$str .= ' (' . implode($op, $parts) . ') '; $str .= ' (' . implode($op, $parts) . ') ';