Fix up intersection.

discoverygarden · Apr 4, 2024 · de3eb89 · de3eb89
1 parent 787ae75
commit de3eb89
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/SearchApiTracker.php b/src/SearchApiTracker.php
@@ -187,7 +187,12 @@ public function mediaGetFile(?MediaInterface $media) : ?FileInterface {
   protected function getMediaContainers(?MediaInterface $media) : array {
     /** @var \Drupal\Core\Field\EntityReferenceFieldItemList|null $containers */
     $containers = $media?->get(IslandoraUtils::MEDIA_OF_FIELD);
-    return $containers?->referencedEntities() ?? [];
+    $entities = $containers?->referencedEntities() ?? [];
+    $to_return = [];
+    foreach ($entities as $entity) {
+      $to_return[$entity->id()] = $entity;
+    }
+    return $to_return;
   }
 
   /**
@@ -206,10 +211,10 @@ public function mediaWriteReaction(MediaInterface $media) : void {
 
     $same_file = $original_file === $current_file;
 
-    $original_containers = array_values($this->getMediaContainers($media->original ?? NULL));
-    $current_containers = array_values($this->getMediaContainers($media));
+    $original_containers = $this->getMediaContainers($media->original ?? NULL);
+    $current_containers = $this->getMediaContainers($media);
 
-    $same_containers = $current_containers == array_intersect($current_containers, $original_containers);
+    $same_containers = $current_containers == array_intersect_key($current_containers, $original_containers);
 
     if (!($same_file && $same_containers)) {
       if ($original_file) {