Merge branch 'release/2.0.3'

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v2.0.3
+## 09/12/2016
+
+1. [](#improved)
+    * Use `Page::slug()` for form name if not set in the form itself (better backwards compatibility)
+
 # v2.0.2
 ## 09/08/2016
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Form
-version: 2.0.2
+version: 2.0.3
 description: Enables the forms handling
 icon: check-square
 author:

classes/form.php

@@ -65,6 +65,8 @@ class Form extends Iterator implements \Serializable
      * Create form for the given page.
      *
      * @param Page $page
+     * @param null $name
+     * @param null $form
      */
     public function __construct(Page $page, $name = null, $form = null)
     {

form.php

@@ -186,7 +186,7 @@ public function onPagesInitialized()
                     'onFormValidationError' => ['onFormValidationError', 0]
                 ]);
 
-                $current_form_name = filter_input(INPUT_POST, '__form-name__');
+                $current_form_name = $this->getFormName($this->grav['page']);
                 $this->json_response = [];
 
                 if ($form = $this->getFormByName($current_form_name)) {
@@ -536,6 +536,21 @@ private function udate($format = 'u', $utimestamp = null)
         return date(preg_replace('`(?<!\\\\)u`', \sprintf('%06d', $milliseconds), $format), $timestamp);
     }
 
+    /**
+     * @param Page $page
+     * @return mixed
+     */
+    private function getFormName(Page $page)
+    {
+        $name = filter_input(INPUT_POST, '__form-name__');
+
+        if (!$name) {
+            $name = $page->slug();
+        }
+
+        return $name;
+    }
+
     /**
      * function to get a specific form
      *