Fix error messages showing for multiple forms on a single page

engram-design · engram-design · commit 30d680792ce2 · 2020-07-30T21:38:50.000+10:00
diff --git a/src/elements/Form.php b/src/elements/Form.php
@@ -652,7 +652,8 @@ public function getCurrentSubmission()
         // See if there's a submission on routeParams - an error has occurred.
         $params = Craft::$app->getUrlManager()->getRouteParams();
 
-        if (isset($params['submission'])) {
+        // Make sure to check the right submission
+        if (isset($params['submission']) && $params['submission']->form->id == $this->id) {
             return $params['submission'];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,8 @@ public function getCurrentSubmission()`
`652`	`652`	`// See if there's a submission on routeParams - an error has occurred.`
`653`	`653`	`$params = Craft::$app->getUrlManager()->getRouteParams();`
`654`	`654`
`655`		`- if (isset($params['submission'])) {`
	`655`	`+ // Make sure to check the right submission`
	`656`	`+ if (isset($params['submission']) && $params['submission']->form->id == $this->id) {`
`656`	`657`	`return $params['submission'];`
`657`	`658`	`}`
`658`	`659`