Merge 2514255 into 03b5d11

EC-CUBE · Aug 2, 2018 · 09f8abb · 09f8abb
2 parents 03b5d11 + 2514255
commit 09f8abb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Eccube/Form/Type/RepeatedEmailType.php b/src/Eccube/Form/Type/RepeatedEmailType.php
@@ -28,7 +28,7 @@ class RepeatedEmailType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'entry_type' => EmailType::class,
+            'type' => EmailType::class,
             'required' => true,
             'invalid_message' => 'form.member.email.invalid',
             'options' => [

diff --git a/src/Eccube/Resource/template/default/Entry/index.twig b/src/Eccube/Resource/template/default/Entry/index.twig
@@ -25,7 +25,7 @@ file that was distributed with this source code.
         </div>
         <div class="ec-off1Grid">
             <div class="ec-off1Grid__cell">
-                <form method="post" action="{{ url('entry') }}" novalidate class="h-adr">
+                <form method="post" action="{{ url('entry') }}" class="h-adr">
                     <span class="p-country-name" style="display:none;">Japan</span>
                     {{ form_widget(form._token) }}
                     <div class="ec-borderedDefs">

diff --git a/src/Eccube/Resource/template/default/Mypage/change.twig b/src/Eccube/Resource/template/default/Mypage/change.twig
@@ -32,7 +32,7 @@ file that was distributed with this source code.
             <div class="ec-editRole">
                 <div class="ec-off1Grid">
                     <div class="ec-off1Grid__cell">
-                        <form method="post" action="{{ url('mypage_change') }}" novalidate class="h-adr">
+                        <form method="post" action="{{ url('mypage_change') }}" class="h-adr">
                             <span class="p-country-name" style="display:none;">Japan</span>
                             {{ form_widget(form._token) }}
                             <div class="ec-borderedDefs">