Merge branch 'release/7.0.2'

rhukster · rhukster · commit b37e9162ae55 · 2022-10-05T11:23:02.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v7.0.2
+## 10/05/2022
+
+1. [](#bugfix)
+   * Fix for modular form definitions at root-level (useful for storing shared forms)
+
 # v7.0.1
 ## 09/20/2022
 
diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Form
 slug: form
 type: plugin
-version: 7.0.1
+version: 7.0.2
 description: Enables forms handling and processing
 icon: check-square
 author:
diff --git a/form.php b/form.php
@@ -797,7 +797,7 @@ public function onFormValidationError(Event $event): void
      */
     public function addFormDefinition(PageInterface $page, string $name, array $form): void
     {
-        $route = $page->home() ? '/' : $page->route();
+        $route = ($page->home() ? '/' : $page->route()) ?? '/';
 
         if (!isset($this->forms[$route][$name])) {
             $form['_page_routable'] = !$page->isModule();

Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,7 @@ public function onFormValidationError(Event $event): void`
`797`	`797`	`*/`
`798`	`798`	`public function addFormDefinition(PageInterface $page, string $name, array $form): void`
`799`	`799`	`{`
`800`		`- $route = $page->home() ? '/' : $page->route();`
	`800`	`+ $route = ($page->home() ? '/' : $page->route()) ?? '/';`
`801`	`801`
`802`	`802`	`if (!isset($this->forms[$route][$name])) {`
`803`	`803`	`$form['_page_routable'] = !$page->isModule();`