From b7931a14723c98bea7b12f16c509ce8fc16f030e Mon Sep 17 00:00:00 2001
From: Kevin Ditscheid <kevin.ditscheid@sgalinski.de>
Date: Wed, 27 Apr 2022 12:26:43 +0200
Subject: [PATCH] [BUGFIX] Fix wrong tag selection on the extbase query

---
 Classes/Domain/Repository/NewsRepository.php | 5 ++++-
 Classes/ViewHelpers/RelatedViewHelper.php    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Classes/Domain/Repository/NewsRepository.php b/Classes/Domain/Repository/NewsRepository.php
index 6e9a2db..7b5f136 100644
--- a/Classes/Domain/Repository/NewsRepository.php
+++ b/Classes/Domain/Repository/NewsRepository.php
@@ -583,9 +583,12 @@ class NewsRepository extends AbstractRepository {
 		// "around" the given news, where newer news are preferred due to the ordering.
 		$tags = $news->getTags();
 		if ($tags->count() > 0) {
+			$tagConstraints = [];
 			foreach ($tags as $tag) {
-				$constraints[] = $query->contains('tags', $tag);
+				$tagConstraints[] = $query->contains('tags', $tag);
 			}
+
+			$constraints[] = $query->logicalOr($tagConstraints);
 		} else {
 			$constraints[] = $query->equals('pid', $news->getPid());
 		}
diff --git a/Classes/ViewHelpers/RelatedViewHelper.php b/Classes/ViewHelpers/RelatedViewHelper.php
index 75fd1bf..83629d2 100644
--- a/Classes/ViewHelpers/RelatedViewHelper.php
+++ b/Classes/ViewHelpers/RelatedViewHelper.php
@@ -57,7 +57,7 @@ class RelatedViewHelper extends AbstractViewHelper {
 			$iterationData = [
 				'index' => 0,
 				'cycle' => 1,
-				'total' => count($related)
+				'total' => $related->count()
 			];
 		}
 
-- 
GitLab