From 46cd2f99503af623456ddfcf78dc5dc767891ebd Mon Sep 17 00:00:00 2001
From: Jordan Dukart <jordan@discoverygarden.ca>
Date: Mon, 13 Mar 2023 13:12:00 -0300
Subject: [PATCH] Reset contexts before evaluation. (#932)

* Reset contexts before evaluation.
* Only reset when Islandora's ContextProviders are being used.
---
 src/IslandoraContextManager.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/IslandoraContextManager.php b/src/IslandoraContextManager.php
index 801e3253..c7228195 100644
--- a/src/IslandoraContextManager.php
+++ b/src/IslandoraContextManager.php
@@ -13,6 +13,14 @@ use Drupal\Component\Plugin\Exception\ContextException;
  */
 class IslandoraContextManager extends ContextManager {
 
+  /**
+   * Allow the contexts to be reset before evaluation.
+   */
+  protected function resetContextEvaluation() {
+    $this->contexts = [];
+    $this->contextConditionsEvaluated = FALSE;
+  }
+
   /**
    * Evaluate all context conditions.
    *
@@ -22,7 +30,11 @@ class IslandoraContextManager extends ContextManager {
   public function evaluateContexts(array $provided = []) {
 
     $this->activeContexts = [];
-
+    // XXX: Ensure that no earlier executed contexts in the request are still
+    // present when being triggered via Islandora's ContextProviders.
+    if (!empty($provided)) {
+      $this->resetContextEvaluation();
+    }
     /** @var \Drupal\context\ContextInterface $context */
     foreach ($this->getContexts() as $context) {
       if ($this->evaluateContextConditions($context, $provided) && !$context->disabled()) {