Index: branches/version-2_5-dev/data/plugin/bingo/templates/mobile/shopping/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/plugin/bingo/templates/mobile/shopping/complete.tpl	(revision 20049)
+++ branches/version-2_5-dev/data/plugin/bingo/templates/mobile/shopping/complete.tpl	(revision 20050)
@@ -34,5 +34,5 @@
 ご注文、有り難うございました。<br>
 商品到着をお楽しみにお待ち下さいませ。<br>
-どうぞ、今後とも、<!--{$arrInfo.shop_name|escape}-->をよろしくお願いします。<br>
+どうぞ、今後とも、<!--{$arrInfo.shop_name|h}-->をよろしくお願いします。<br>
 <br>
 
Index: branches/version-2_5-dev/data/plugin/bingo/templates/shopping/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/plugin/bingo/templates/shopping/complete.tpl	(revision 20049)
+++ branches/version-2_5-dev/data/plugin/bingo/templates/shopping/complete.tpl	(revision 20050)
@@ -26,5 +26,5 @@
       <img src="<!--{$TPL_URLPATH}-->img/shopping/flow04.gif" width="700" height="36" alt="購入手続きの流れ" />
     </p>
-    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <h2 class="title"><!--{$tpl_title|h}--></h2>
 
     <!-- ▼その他決済情報を表示する場合は表示 -->
@@ -51,5 +51,5 @@
       </em><br />
 
-      <em><!--{$arrInfo.shop_name|escape}-->の商品をご購入いただき、ありがとうございました。</em>
+      <em><!--{$arrInfo.shop_name|h}-->の商品をご購入いただき、ありがとうございました。</em>
 
       <p>ただいま、ご注文の確認メールをお送りさせていただきました。<br />
@@ -57,5 +57,5 @@
         今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
 
-      <p><!--{$arrInfo.shop_name|escape}--><br />
+      <p><!--{$arrInfo.shop_name|h}--><br />
         TEL：<!--{$arrInfo.tel01}-->-<!--{$arrInfo.tel02}-->-<!--{$arrInfo.tel03}--> <!--{if $arrInfo.business_hour != ""}-->（受付時間/<!--{$arrInfo.business_hour}-->）<!--{/if}--><br />
         E-mail：<a href="mailto:<!--{$arrInfo.email02|escape:'hex'}-->"><!--{$arrInfo.email02|escape:'hexentity'}--></a></p>
Index: branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl	(revision 20049)
+++ branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl	(revision 20050)
@@ -41,5 +41,5 @@
                     <link><!--{$arrNews[cnt].news_url|h}--></link>
                 <!--{/if}-->
-                <title><!--{$arrNews[cnt].news_title|sfMbConvertEncoding:$encode|escape}--></title>
+                <title><!--{$arrNews[cnt].news_title|sfMbConvertEncoding:$encode|h}--></title>
                 <description><!--{$arrNews[cnt].news_comment|truncate:256|sfMbConvertEncoding:$encode|h}--></description>
                 <pubDate><!--{$arrNews[cnt].news_date|h}--></pubDate>
Index: branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	(revision 20049)
+++ branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	(revision 20050)
@@ -166,5 +166,5 @@
                 <p>
                     <!--{if $tpl_prev_url != ""}-->
-                        <a href="<!--{$tpl_prev_url|escape}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back_on.gif','back');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back.gif','back');">
+                        <a href="<!--{$tpl_prev_url|h}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back_on.gif','back');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back.gif','back');">
                             <img src="<!--{$TPL_URLPATH}-->img/button/btn_back.gif" width="150" height="30" alt="買い物を続ける" name="back" /></a>&nbsp;&nbsp;
                     <!--{/if}-->
Index: branches/version-2_5-dev/data/Smarty/templates/mobile/cart/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/cart/index.tpl	(revision 20049)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/cart/index.tpl	(revision 20050)
@@ -93,5 +93,5 @@
 
 <!--{if $tpl_prev_url != ""}-->
-    <a href="<!--{$tpl_prev_url|escape}-->">[emoji:69]お買物を続ける</a>
+    <a href="<!--{$tpl_prev_url|h}-->">[emoji:69]お買物を続ける</a>
 <!--{/if}-->
 <!--{/foreach}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/adminarea.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/adminarea.tpl	(revision 19996)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/adminarea.tpl	(revision 20050)
@@ -37,5 +37,5 @@
     <p class="red">良く解らない場合はこの設定は変更しないでください</p>
     <!--{if $arrErr.all}-->
-    <p class="error"><!--{$arrErr.all|escape}--></p>
+    <p class="error"><!--{$arrErr.all|h}--></p>
     <!--{/if}-->
   </div>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 20049)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 20050)
@@ -165,5 +165,5 @@
                 <p>
                     <!--{if $tpl_prev_url != ""}-->
-                     <a href="<!--{$tpl_prev_url|escape}-->" class="spbtn spbtn-medeum">
+                     <a href="<!--{$tpl_prev_url|h}-->" class="spbtn spbtn-medeum">
                                     買い物を続ける</a>&nbsp;&nbsp;
                     <!--{/if}-->