From 709938cf291baba1b6748b05b8d94a3f54185d60 Mon Sep 17 00:00:00 2001
From: Lucas van Schaik <schaik@library.leidenuniv.nl>
Date: Fri, 17 Feb 2023 16:56:42 +0100
Subject: [PATCH] Implement solution for drupal issues 3089660 and 3045666

---
 src/IslandoraContextManager.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/IslandoraContextManager.php b/src/IslandoraContextManager.php
index c7228195..a8f18772 100644
--- a/src/IslandoraContextManager.php
+++ b/src/IslandoraContextManager.php
@@ -60,7 +60,11 @@ class IslandoraContextManager extends ContextManager {
     $conditions = $context->getConditions();
 
     // Apply context to any context aware conditions.
-    $this->applyContexts($conditions, $provided);
+    // Abort if the application of contexts has been unsuccessful
+    // similarly to BlockAccessControlHandler::checkAccess().
+    if (!$this->applyContexts($conditions, $provided)) {
+      return FALSE;
+    }
 
     // Set the logic to use when validating the conditions.
     $logic = $context->requiresAllConditions()
@@ -88,6 +92,7 @@ class IslandoraContextManager extends ContextManager {
    *   TRUE if conditions pass
    */
   protected function applyContexts(ConditionPluginCollection &$conditions, array $provided = []) {
+    $passed = FALSE;
     foreach ($conditions as $condition) {
       if ($condition instanceof ContextAwarePluginInterface) {
         try {
@@ -98,14 +103,15 @@ class IslandoraContextManager extends ContextManager {
             $contexts = $provided;
           }
           $this->contextHandler->applyContextMapping($condition, $contexts);
+          $passed = TRUE;
         }
         catch (ContextException $e) {
-          return FALSE;
+          continue;
         }
       }
     }
 
-    return TRUE;
+    return $passed;
   }
 
 }