From d38c7239083081dd955c4ee45f3cb64ac5884c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kud=C4=9Blka?= <thorewi@gmail.com>
Date: Tue, 2 Mar 2021 09:33:00 +0100
Subject: [PATCH] Update QueryObjectDataSource.php

---
 src/QueryObjectDataSource.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/QueryObjectDataSource.php b/src/QueryObjectDataSource.php
index 27d6103..bed5794 100644
--- a/src/QueryObjectDataSource.php
+++ b/src/QueryObjectDataSource.php
@@ -118,6 +118,7 @@ public function getData(): array {
 		if ($this->data) {
 			return $this->data;
 		}
+
 		return $this->getResultSet()->toArray();
 	}
 
@@ -140,15 +141,14 @@ public function filter(array $filters): void
 		if (is_callable($this->filterCallback)) {
 			call_user_func($this->filterCallback, $this->queryObject, $filters);
 		}
-		else {
-			foreach ($filters as $filter) {
-				if ($filter->isValueSet()) {
-					if ($filter->getConditionCallback()) {
-						call_user_func($filter->getConditionCallback(), $this->queryObject, $filter->getValue());
-					}
-					elseif ($this->queryObject instanceof IQueryObject) {
-						$this->queryObject->searchIn($filter->getKey(), $filter->getValue(), !$filter instanceof FilterText);
-					}
+
+		foreach ($filters as $filter) {
+			if ($filter->isValueSet()) {
+				if ($filter->getConditionCallback()) {
+					call_user_func($filter->getConditionCallback(), $this->queryObject, $filter->getValue());
+				}
+				elseif ($this->queryObject instanceof IQueryObject) {
+					$this->queryObject->searchIn($filter->getKey(), $filter->getValue(), !$filter instanceof FilterText);
 				}
 			}
 		}