pkp#8288 Fix missing assoc_type check; properly enclose OR clause

withanage · Aug 4, 2023 · b802e3e · b802e3e
1 parent 52d13c6
commit b802e3e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/classes/announcement/Collector.php b/classes/announcement/Collector.php
@@ -20,6 +20,7 @@
 use PKP\core\Core;
 use PKP\core\interfaces\CollectorInterface;
 use PKP\plugins\Hook;
+use APP\core\Application;
 
 /**
  * @template T of Announcement
@@ -133,16 +134,17 @@ public function getQueryBuilder(): Builder
 
         if (isset($this->contextIds)) {
             $qb->whereIn('a.assoc_id', $this->contextIds);
+            $qb->where('a.assoc_type', Application::get()->getContextAssocType());
         }
 
         if (isset($this->typeIds)) {
             $qb->whereIn('a.type_id', $this->typeIds);
         }
 
-        if (isset($this->isActive)) {
+        $qb->when($this->isActive, fn($qb) => $qb->where(function($qb) {
             $qb->where('date_expire', '<=', $this->isActive)
-                ->orWhereNull('date_expire');
-        }
+                  ->orWhereNull('date_expire');
+        }));
 
         if ($this->searchPhrase !== null) {
             $words = explode(' ', $this->searchPhrase);