Merge branch 'craft-4' of https://github.com/verbb/formie into craft-5

# Conflicts: # CHANGELOG.md # composer.json
verbb · Aug 29, 2024 · b2a3f2d · b2a3f2d
2 parents 39d8c44 + f2b71c9
commit b2a3f2d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -251,7 +251,12 @@
 - `Field::name` attribute has been deprecated. Use `Field::label` instead.
 - `Field::inputHtml()` method has been deprecated. Use `Field::cpInputHtml()` instead.
 
-## 2.1.27 - 2024-08-14
+## 2.1.28 - 2024-08-29
+
+### Fixed
+- Fixed an error when parsing variable tokens.
+
+## 2.1.27 - 2024-08-29
 
 ### Added
 - Added “Page URI” and “Page Name” to HubSpot integration for Forms.

diff --git a/src/helpers/Variables.php b/src/helpers/Variables.php
@@ -154,9 +154,9 @@ public static function getParsedValue(mixed $value, Submission $submission = nul
  // This helps to only cache it per-submission, when being run in queues.
  $cacheKey = mt_rand();
 
- if ($submission->id) {
+ if ($submission && $submission->id) {
  $cacheKey = 'submission' . $submission->id;
- } else if ($form->id) {
+ } else if ($form && $form->id) {
  $cacheKey = 'form' . $form->id;
  }