Fixed #16474

craftcms · Jan 21, 2025 · e27a8b7 · e27a8b7
1 parent 41b3000
commit e27a8b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Craft CMS 4
 
+## Unreleased
+
+- Fixed an error that occurred when referencing a single section entry by its handle. ([#16474](https://github.com/craftcms/cms/issues/16474))
+
 ## 4.14.0 - 2025-01-21
 
 ### Content Management

diff --git a/src/web/twig/nodevisitors/SinglePreloader.php b/src/web/twig/nodevisitors/SinglePreloader.php
@@ -11,7 +11,7 @@
 use craft\web\twig\nodes\PreloadSinglesNode;
 use Twig\Environment;
 use Twig\Node\BodyNode;
-use Twig\Node\Expression\NameExpression;
+use Twig\Node\Expression\Variable\ContextVariable;
 use Twig\Node\MacroNode;
 use Twig\Node\ModuleNode;
 use Twig\Node\Node;
@@ -39,9 +39,8 @@ public function enterNode(Node $node, Environment $env): Node
             array_unshift($this->_foundVariables, []);
         } elseif (
             !empty($this->_foundVariables) &&
-            get_class($node) === NameExpression::class &&
+            $node instanceof ContextVariable &&
             $node->hasAttribute('name') &&
-            !$node->isSpecial() &&
             !$node->getAttribute('always_defined') &&
             (!$node->hasAttribute('spread') || !$node->getAttribute('spread'))
         ) {