From 1d9f249363640995e884372ce64a512e06ad6e29 Mon Sep 17 00:00:00 2001
From: Awilum <sergey.romanenko@flextype.org>
Date: Fri, 9 Sep 2022 17:17:28 +0300
Subject: [PATCH] feat(core): updates for #586 #585 #584

---
 src/flextype/core/Entries/Directives/ExpressionsDirective.php | 2 ++
 src/flextype/core/Parsers/Shortcodes/EvalShortcode.php        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/flextype/core/Entries/Directives/ExpressionsDirective.php b/src/flextype/core/Entries/Directives/ExpressionsDirective.php
index b550e39c..05ced1af 100644
--- a/src/flextype/core/Entries/Directives/ExpressionsDirective.php
+++ b/src/flextype/core/Entries/Directives/ExpressionsDirective.php
@@ -34,6 +34,8 @@ emitter()->addListener('onEntriesFetchSingleField', static function (): void {
 
     $field = entries()->registry()->get('methods.fetch.field');
 
+    $vars = [];
+        
     // Convert entry fields to vars.
     foreach (json_decode(json_encode((object) entries()->registry()->get('methods.fetch.result')), false) as $key => $value) {
         $vars[$key] = $value;
diff --git a/src/flextype/core/Parsers/Shortcodes/EvalShortcode.php b/src/flextype/core/Parsers/Shortcodes/EvalShortcode.php
index 67f35449..44337e20 100644
--- a/src/flextype/core/Parsers/Shortcodes/EvalShortcode.php
+++ b/src/flextype/core/Parsers/Shortcodes/EvalShortcode.php
@@ -41,6 +41,6 @@ parsers()->shortcodes()->addHandler('eval', static function (ShortcodeInterface
 });
 
 parsers()->shortcodes()->addHandler('compile', static function (ShortcodeInterface $s) {
-   return expression()->compile(parsers()->shortcodes()->parse($s->getContent()));
+   return parsers()->expressions()->compile(parsers()->shortcodes()->parse($s->getContent()));
 });