MERGE: Merge branch '2.0' into master

neos · Apr 12, 2017 · 3c8468b · 3c8468b
2 parents 190697d + 85733d4
commit 3c8468b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Classes/ViewHelpers/Form/DatePickerViewHelper.php b/Classes/ViewHelpers/Form/DatePickerViewHelper.php
@@ -12,6 +12,7 @@
  */
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Utility\Algorithms;
 use Neos\FluidAdaptor\ViewHelpers\Form\AbstractFormFieldViewHelper;
 
 /**
@@ -74,7 +75,7 @@ public function render($dateFormat = 'Y-m-d', $enableDatePicker = true)
         if ($this->hasArgument('id')) {
             $id = $this->arguments['id'];
         } else {
-            $id = 'field' . md5(uniqid());
+            $id = 'field' . md5(Algorithms::generateRandomString(13));
             $this->tag->addAttribute('id', $id);
         }
         $this->setErrorClassAttribute();

diff --git a/composer.json b/composer.json
@@ -14,6 +14,9 @@
             "Neos\\Form\\": "Classes"
         }
     },
+    "suggest": {
+        "neos/swiftmailer": "The EmailFinisher needs this to be useable"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "4.0.x-dev"