From c5c7a913f16f5ddbf4ff44d6db7bdfcd650cecaa Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:43:31 -0400
Subject: [PATCH] Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
---
interface/lib/classes/IDS/Monitor.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/IDS/Monitor.php b/interface/lib/classes/IDS/Monitor.php
index f93e748..90c8958 100644
--- a/interface/lib/classes/IDS/Monitor.php
+++ b/interface/lib/classes/IDS/Monitor.php
@@ -250,7 +250,7 @@
$filterSet = $this->storage->getFilterSet();
if ($tags = $this->tags) {
- $filterSet = array_filter(
+ $filterSet = @array_filter(
$filterSet,
function (Filter $filter) use ($tags) {
return (bool) array_intersect($tags, $filter->getTags());
@@ -259,7 +259,7 @@
}
$scanKeys = $this->scanKeys;
- $filterSet = array_filter(
+ $filterSet = @array_filter(
$filterSet,
function (Filter $filter) use ($key, $value, $scanKeys) {
return $filter->match($value) || $scanKeys && $filter->match($key);
--
Gitblit v1.9.1