Merge pull request craftcms#12229 from craftcms/bugfix/cms-12228-cano…

…nical-id Handle cases where `Element->_canonical` is false
michaelrog · Oct 31, 2022 · 3d919c0 · 3d919c0
2 parents 93a3196 + 7b6e78f
commit 3d919c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed asset indexing for Local filesystems that were configured to use a symlinked server path.
+- Fixed an error that could occur when calling `craft\base\Element::getCanonicalUid()` on a draft loaded for a site that the canonical element didn’t exist on yet. ([#12228](https://github.com/craftcms/cms/issues/12228))
 
 ## 4.3.1 - 2022-10-27
 

diff --git a/src/base/Element.php b/src/base/Element.php
@@ -2582,7 +2582,7 @@ public function getCanonicalUid(): ?string
         }
 
         // If the canonical element is already memoized via getCanonical(), go with its UUID
-        if (isset($this->_canonical)) {
+        if (isset($this->_canonical) && $this->_canonical) {
             return $this->_canonical->uid;
         }