Merge branch 'release/1.3.1'

Author: flaviocopes

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.3.1
+## 07/27/2016
+
+1. [](#improved)
+    * Added support for multiple emails in `email` field (add `multiple: true` to enable)
+1. [](#bugfix)
+    * Fixed backward incompatibility with forms submission and data retrieval [getgrav/grav#933](https://github.com/getgrav/grav/issues/933)
+    
 # v1.3.0
 ## 07/14/2016
 

blueprints.yaml

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

classes/form.php

@@ -233,6 +233,11 @@ public function post()
             $data         = $this->values->get('data');
             $files        = (array)$_FILES;
 
+            // Add post data to form dataset
+            if (!$data) {
+                $data = $this->values->toArray();
+            }
+
             if (method_exists('Grav\Common\Utils', 'getNonce')) {
                 if (!$this->values->get('form-nonce') || !Utils::verifyNonce($this->values->get('form-nonce'), 'form')) {
                     $event = new Event(['form'    => $this,
@@ -259,11 +264,6 @@ public function post()
                 $i++;
             }
 
-            // Add post data to form dataset
-            if (!$data) {
-                $data = $this->values->toArray();
-            }
-
             $this->data->merge($data);
             $this->data->merge($files);
         }

templates/forms/fields/email/email.html.twig

@@ -2,5 +2,6 @@
 
 {% block input_attributes %}
     type="email"
+    {% if field.multiple in ['on', 'true', 1] %}multiple="multiple"{% endif %}
     {{ parent() }}
 {% endblock %}