Merge pull request #743 from brandonkelly/localized-fix

Maintain ownerId from getLocalized()
spicywebau · May 21, 2023 · 7232a30 · 7232a30
2 parents 33b2b24 + 008378a
commit 7232a30
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/elements/Block.php b/src/elements/Block.php
@@ -351,6 +351,21 @@ public function getCacheTags(): array
         ];
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getLocalized(): ElementQueryInterface|Collection
+    {
+        $query = parent::getLocalized();
+
+        if ($query instanceof BlockQuery && $this->ownerId !== null) {
+            // Maintain the same ownerId for queried blocks
+            $query->ownerId($this->ownerId);
+        }
+
+        return $query;
+    }
+
     /**
      * @inheritdoc
      */