tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into bugfix/dashboard-rework-7751

This commit is contained in:
Marius Hein 2014-11-20 12:48:28 +01:00
parent bfa7320d85 38957e340b
commit d62d487251
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) . ') ';