From c53c4a6fc09aa390aae530fa9f66dc18dcb58409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= <nobuhiko.kimoto@gmail.com>
Date: Fri, 27 Jul 2018 17:16:04 +0900
Subject: [PATCH] =?UTF-8?q?fix=20#124=20selected=20=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E3=81=AE=20h=20=E4=BF=AE=E9=A3=BE=E5=AD=90=E3=82=92=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/Smarty/templates/admin/basis/tax.tpl        | 10 +++++-----
 data/Smarty/templates/admin/order/mail.tpl       |  2 +-
 data/Smarty/templates/admin/products/review.tpl  | 16 ++++++++--------
 data/Smarty/templates/admin/total/index.tpl      | 12 ++++++------
 data/Smarty/templates/default/contact/index.tpl  |  2 +-
 .../default/frontparts/form_personal_input.tpl   |  4 ++--
 data/Smarty/templates/sphone/contact/index.tpl   |  2 +-
 .../sphone/shopping/nonmember_input.tpl          |  4 ++--
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/data/Smarty/templates/admin/basis/tax.tpl b/data/Smarty/templates/admin/basis/tax.tpl
index ce2e5cdad6..5186b753ae 100644
--- a/data/Smarty/templates/admin/basis/tax.tpl
+++ b/data/Smarty/templates/admin/basis/tax.tpl
@@ -64,23 +64,23 @@
 
                 <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
                 <option value="" selected="selected">------</option>
-                <!--{html_options options=$arrYear selected=$arrForm[$key1].value|h}-->
+                <!--{html_options options=$arrYear selected=$arrForm[$key1].value}-->
                 </select>年
                 <select name="<!--{$key2}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->">
                 <option value="" selected="selected">----</option>
-                <!--{html_options options=$objDate->getMonth() selected=$arrForm[$key2].value|h}-->
+                <!--{html_options options=$objDate->getMonth() selected=$arrForm[$key2].value}-->
                 </select>月
                 <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->">
                 <option value="" selected="selected">----</option>
-                <!--{html_options options=$objDate->getDay() selected=$arrForm[$key3].value|h}-->
+                <!--{html_options options=$objDate->getDay() selected=$arrForm[$key3].value}-->
                 </select>日
                 <select name="<!--{$key4}-->" style="<!--{$arrErr[$key4]|sfGetErrorColor}-->">
                 <option value="" selected="selected">----</option>
-                <!--{html_options options=$objDate->getHour() selected=$arrForm[$key4].value|h}-->
+                <!--{html_options options=$objDate->getHour() selected=$arrForm[$key4].value}-->
                 </select>時
                 <select name="<!--{$key5}-->" style="<!--{$arrErr[$key5]|sfGetErrorColor}-->">
                 <option value="" selected="selected">----</option>
-                <!--{html_options options=$arrMinutes selected=$arrForm[$key5].value|h}-->
+                <!--{html_options options=$arrMinutes selected=$arrForm[$key5].value}-->
                 </select>分
             </td>
         </tr>
diff --git a/data/Smarty/templates/admin/order/mail.tpl b/data/Smarty/templates/admin/order/mail.tpl
index b79e163513..69269523ac 100644
--- a/data/Smarty/templates/admin/order/mail.tpl
+++ b/data/Smarty/templates/admin/order/mail.tpl
@@ -64,7 +64,7 @@
                     <span class="attention"><!--{$arrErr[$key]}--></span>
                     <select name="template_id" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" onchange="eccube.setModeAndSubmit('change', '', '');">
                     <option value="" selected="selected">選択してください</option>
-                    <!--{html_options options=$arrMAILTEMPLATE selected=$arrForm[$key].value|h}-->
+                    <!--{html_options options=$arrMAILTEMPLATE selected=$arrForm[$key].value}-->
                     </select>
                 </td>
             </tr>
diff --git a/data/Smarty/templates/admin/products/review.tpl b/data/Smarty/templates/admin/products/review.tpl
index c7dcdad0c8..3d55a04b49 100644
--- a/data/Smarty/templates/admin/products/review.tpl
+++ b/data/Smarty/templates/admin/products/review.tpl
@@ -51,7 +51,7 @@
                     <!--{assign var=key value=search_recommend_level}-->
                     <select name="<!--{$key}-->">
                         <option value="" selected="selected">選択してください</option>
-                        <!--{html_options options=$arrRECOMMEND selected=$arrForm[$key].value|h}-->
+                        <!--{html_options options=$arrRECOMMEND selected=$arrForm[$key].value}-->
                     </select>
                 </td>
             </tr>
@@ -64,27 +64,27 @@
                     <!--{/if}-->
                     <select name="search_startyear" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">----</option>
-                        <!--{html_options options=$arrStartYear selected=$arrForm.search_startyear|h}-->
+                        <!--{html_options options=$arrStartYear selected=$arrForm.search_startyear}-->
                     </select>年
                     <select name="search_startmonth" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">--</option>
-                        <!--{html_options options=$arrStartMonth selected=$arrForm.search_startmonth|h}-->
+                        <!--{html_options options=$arrStartMonth selected=$arrForm.search_startmonth}-->
                     </select>月
                     <select name="search_startday" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">--</option>
-                        <!--{html_options options=$arrStartDay selected=$arrForm.search_startday|h}-->
+                        <!--{html_options options=$arrStartDay selected=$arrForm.search_startday}-->
                     </select>日～
                     <select name="search_endyear" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">----</option>
-                        <!--{html_options options=$arrEndYear selected=$arrForm.search_endyear|h}-->
+                        <!--{html_options options=$arrEndYear selected=$arrForm.search_endyear}-->
                     </select>年
                     <select name="search_endmonth" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">--</option>
-                        <!--{html_options options=$arrEndMonth selected=$arrForm.search_endmonth|h}-->
+                        <!--{html_options options=$arrEndMonth selected=$arrForm.search_endmonth}-->
                     </select>月
                     <select name="search_endday" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">--</option>
-                        <!--{html_options options=$arrEndDay selected=$arrForm.search_endday|h}-->
+                        <!--{html_options options=$arrEndDay selected=$arrForm.search_endday}-->
                     </select>日
                 </td>
             </tr>
@@ -97,7 +97,7 @@
                 <span class="attention"><!--{$arrErr[$key]}--></span>
             <!--{/if}-->
             <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-            <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max|h}-->
+            <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
             </select> 件</p>
             <div class="btn-area">
                 <ul>
diff --git a/data/Smarty/templates/admin/total/index.tpl b/data/Smarty/templates/admin/total/index.tpl
index edc45a5fe8..3946062cd3 100644
--- a/data/Smarty/templates/admin/total/index.tpl
+++ b/data/Smarty/templates/admin/total/index.tpl
@@ -63,27 +63,27 @@
                     <!--{/if}-->
                     <select name="search_startyear"    style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">----</option>
-                        <!--{html_options options=$arrYear selected=$arrForm.search_startyear.value|h}-->
+                        <!--{html_options options=$arrYear selected=$arrForm.search_startyear.value}-->
                     </select>年
                     <select name="search_startmonth" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">--</option>
-                        <!--{html_options options=$arrMonth selected=$arrForm.search_startmonth.value|h}-->
+                        <!--{html_options options=$arrMonth selected=$arrForm.search_startmonth.value}-->
                     </select>月
                     <select name="search_startday" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
                         <option value="">--</option>
-                        <!--{html_options options=$arrDay selected=$arrForm.search_startday.value|h}-->
+                        <!--{html_options options=$arrDay selected=$arrForm.search_startday.value}-->
                     </select>日～
                     <select name="search_endyear" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">----</option>
-                        <!--{html_options options=$arrYear selected=$arrForm.search_endyear.value|h}-->
+                        <!--{html_options options=$arrYear selected=$arrForm.search_endyear.value}-->
                     </select>年
                     <select name="search_endmonth" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">--</option>
-                        <!--{html_options options=$arrMonth selected=$arrForm.search_endmonth.value|h}-->
+                        <!--{html_options options=$arrMonth selected=$arrForm.search_endmonth.value}-->
                     </select>月
                     <select name="search_endday" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
                         <option value="">--</option>
-                        <!--{html_options options=$arrDay selected=$arrForm.search_endday.value|h}-->
+                        <!--{html_options options=$arrDay selected=$arrForm.search_endday.value}-->
                     </select>日
                     <a class="btn-normal" href="javascript:;" onclick="eccube.fnFormModeSubmit('search_form2', 'search', '', ''); return false;" name="subm">期間で集計する</a>
                 </form>
diff --git a/data/Smarty/templates/default/contact/index.tpl b/data/Smarty/templates/default/contact/index.tpl
index 63b9094b4e..4566794ff0 100644
--- a/data/Smarty/templates/default/contact/index.tpl
+++ b/data/Smarty/templates/default/contact/index.tpl
@@ -72,7 +72,7 @@
                         <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
 
                         <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->">
-                        <option value="">都道府県を選択</option><!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref|h}--></select>
+                        <option value="">都道府県を選択</option><!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref}--></select>
 
                         <p>
                             <input type="text" class="box380" name="addr01" value="<!--{$arrForm.addr01.value|default:$arrData.addr01|h}-->" style="<!--{$arrErr.addr01|sfGetErrorColor}-->; ime-mode: active;" /><br />
diff --git a/data/Smarty/templates/default/frontparts/form_personal_input.tpl b/data/Smarty/templates/default/frontparts/form_personal_input.tpl
index ca69d48c78..e9d454d383 100644
--- a/data/Smarty/templates/default/frontparts/form_personal_input.tpl
+++ b/data/Smarty/templates/default/frontparts/form_personal_input.tpl
@@ -77,7 +77,7 @@
             <!--{/if}-->
             <select name="<!--{$key6}-->" style="<!--{$arrErr[$key6]|sfGetErrorColor}-->">
                     <option value="" selected="selected">国を選択</option>
-                    <!--{html_options options=$arrCountry selected=$arrForm[$key6].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+                    <!--{html_options options=$arrCountry selected=$arrForm[$key6].value|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
             </select>
         </td>
     </tr>
@@ -115,7 +115,7 @@
             <!--{/if}-->
             <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->">
                     <option value="" selected="selected">都道府県を選択</option>
-                    <!--{html_options options=$arrPref selected=$arrForm[$key3].value|h}-->
+                    <!--{html_options options=$arrPref selected=$arrForm[$key3].value}-->
             </select>
             <p class="top"><input type="text" name="<!--{$key4}-->" value="<!--{$arrForm[$key4].value|h}-->" class="box300" style="<!--{$arrErr[$key4]|sfGetErrorColor}-->; ime-mode: active;" /><br />
                 <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
diff --git a/data/Smarty/templates/sphone/contact/index.tpl b/data/Smarty/templates/sphone/contact/index.tpl
index dfbe065411..37cf94537d 100644
--- a/data/Smarty/templates/sphone/contact/index.tpl
+++ b/data/Smarty/templates/sphone/contact/index.tpl
@@ -93,7 +93,7 @@
                 <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
                 <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->" class="boxHarf top data-role-none">
                     <option value="" selected="selected">都道府県</option>
-                    <!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref|h}-->
+                    <!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref}-->
                 </select>
 
                 <input type="text" name="addr01"
diff --git a/data/Smarty/templates/sphone/shopping/nonmember_input.tpl b/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
index 067dddb06b..b1b82fc6ea 100644
--- a/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
+++ b/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
@@ -103,7 +103,7 @@
                 <div class="attention"><!--{$arrErr[$key1]}--></div>
                 <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
                     <option value="" selected="selected">国を選択</option>
-                    <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+                    <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
                 </select>
             </dd>
 
@@ -323,7 +323,7 @@
                     <div class="attention"><!--{$arrErr[$key1]}--></div>
                     <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
                         <option value="" selected="selected">国を選択</option>
-                        <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+                        <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
                     </select>
                 </dd>