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 19943)
+++ branches/version-2_5-dev/data/plugin/bingo/templates/mobile/shopping/complete.tpl	(revision 20049)
@@ -37,5 +37,5 @@
 <br>
 
-<!--{if $arrOther.title.value }-->
+<!--{if $arrOther.title.value}-->
 <!-- ▼その他の決済情報 -->
 ■<!--{$arrOther.title.name}-->情報<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 19998)
+++ branches/version-2_5-dev/data/plugin/bingo/templates/shopping/complete.tpl	(revision 20049)
@@ -29,5 +29,5 @@
 
     <!-- ▼その他決済情報を表示する場合は表示 -->
-    <!--{if $arrOther.title.value }-->
+    <!--{if $arrOther.title.value}-->
     <p><em>■<!--{$arrOther.title.name}-->情報</em><br />
         <!--{foreach key=key item=item from=$arrOther}-->
Index: branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/history.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/history.tpl	(revision 19972)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/mypage/history.tpl	(revision 20049)
@@ -43,15 +43,15 @@
 商品名：<a<!--{if $orderDetail.enable}--> href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$orderDetail.product_id|u}-->"<!--{/if}-->><!--{$orderDetail.product_name|h}--></a><br>
 商品種別：
-<!--{ if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
-<!--{ if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
+<!--{if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
+<!--{if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
 <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a><br>
-<!--{ elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
+<!--{elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
 ダウンロード商品<br>（入金確認中）<br>
-<!--{ elseif $orderDetail.effective != "1"}-->
+<!--{elseif $orderDetail.effective != "1"}-->
 ダウンロード商品<br>（期限切れ）<br>
-<!--{ /if }-->
-<!--{ else if $orderDetail.product_type_id == PRODUCT_TYPE_NORMAL}-->
+<!--{/if}-->
+<!--{else if $orderDetail.product_type_id == PRODUCT_TYPE_NORMAL}-->
 通常商品<br>
-<!--{ /if }-->
+<!--{/if}-->
 単価：
 <!--{assign var=price value=`$orderDetail.price`}-->
Index: branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/complete.tpl	(revision 19961)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/complete.tpl	(revision 20049)
@@ -27,5 +27,5 @@
 <br>
 
-<!--{if $arrOther.title.value }-->
+<!--{if $arrOther.title.value}-->
 <!-- ▼その他の決済情報 -->
 ■<!--{$arrOther.title.name}-->情報<br>
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 19961)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/cart/index.tpl	(revision 20049)
@@ -43,5 +43,5 @@
 	<input type="hidden" name="cartKey" value="<!--{$key}-->">
 	<!--ご注文内容ここから-->
-    <!--{if count($cartKeys) > 1 }-->
+    <!--{if count($cartKeys) > 1}-->
     <hr>
     <!--{$arrProductType[$key]}-->
Index: branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	(revision 19978)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	(revision 20049)
@@ -30,5 +30,5 @@
 メッセージ：<!--{$Message_tmp}-->
 
-<!--{if $arrOther.title.value }-->
+<!--{if $arrOther.title.value}-->
 ■<!--{$arrOther.title.name}-->情報
 <!--{foreach key=key item=item from=$arrOther}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl	(revision 20049)
@@ -50,5 +50,5 @@
   <!--{if $arrSqlList}-->
   <table id="contents-csv-sqllist" class="list center">
-    <!--{ foreach key=key item=item from=$arrSqlList }-->
+    <!--{foreach key=key item=item from=$arrSqlList}-->
     <tr style="background-color:<!--{if $item.sql_id == $sql_id}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
       <td>
@@ -62,5 +62,5 @@
       </td>
     </tr>
-    <!--{ /foreach }-->
+    <!--{/foreach}-->
   </table>
   <!--{/if}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql_view.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql_view.tpl	(revision 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql_view.tpl	(revision 20049)
@@ -32,5 +32,5 @@
     <th>エラー内容</th>
     <td>
-      <!--{if $sqlerr != "" }-->
+      <!--{if $sqlerr != ""}-->
         <!--{$sqlerr|h|nl2br}-->
       <!--{else}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/seo.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 19967)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 20049)
@@ -27,7 +27,7 @@
 <input type="hidden" name="page_id" value="" />
 <div id="basis" class="contents-main">
-  <!--{if count($arrPageData) > 0 }-->
+  <!--{if count($arrPageData) > 0}-->
     <!--{foreach name=device key=device_key item=arrDevicePageData from=$arrPageData}-->
-    <!--{if count($arrDevicePageData) > 0 }-->
+    <!--{if count($arrDevicePageData) > 0}-->
     <!--{foreach name=page key=key item=item from=$arrDevicePageData}-->
     <!-- <!--{$item.page_name}--> ここから -->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 20049)
@@ -261,5 +261,5 @@
 </form>
 
-<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete' or $smarty.post.mode == 'resend_mail') }-->
+<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete' or $smarty.post.mode == 'resend_mail')}-->
 
 <!--★★検索結果一覧★★-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 19998)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 20049)
@@ -263,5 +263,5 @@
                     <td class="center"><a href="#" onclick="fnOpenWindow('../order/edit.php?order_id=<!--{$arrPurchaseHistory[cnt].order_id}-->','order_disp','800','900'); return false;" ><!--{$arrPurchaseHistory[cnt].order_id}--></a></td>
                     <td class="center"><!--{$arrPurchaseHistory[cnt].payment_total|number_format}-->円</td>
-                    <td class="center"><!--{if $arrPurchaseHistory[cnt].status eq 5}--><!--{$arrPurchaseHistory[cnt].commit_date|sfDispDBDate}--><!--{else}-->未発送<!--{ /if }--></td>
+                    <td class="center"><!--{if $arrPurchaseHistory[cnt].status eq 5}--><!--{$arrPurchaseHistory[cnt].commit_date|sfDispDBDate}--><!--{else}-->未発送<!--{/if}--></td>
                     <!--{assign var=payment_id value="`$arrPurchaseHistory[cnt].payment_id`"}-->
                     <td class="center"><!--{$arrPayment[$payment_id]|h}--></td>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 20049)
@@ -80,5 +80,5 @@
 
 <p>
-<!--{if $smarty.post.mode == 'search' }-->
+<!--{if $smarty.post.mode == 'search'}-->
     <!--▼検索結果表示-->
         <!--{if $tpl_linemax > 0}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 19983)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 20049)
@@ -147,8 +147,8 @@
           <input type="text" name="pos-<!--{$arrProductsList[cnt].product_id}-->" size="3" class="box3" />番目へ<a href="?" onclick="fnModeSubmit('move','product_id', '<!--{$arrProductsList[cnt].product_id}-->'); return false;">移動</a><br />
           <!--{/if}-->
-          <!--{if !($smarty.section.cnt.first && $tpl_disppage eq 1) }-->
+          <!--{if !($smarty.section.cnt.first && $tpl_disppage eq 1)}-->
           <a href="?" onclick="fnModeSubmit('up','product_id', '<!--{$arrProductsList[cnt].product_id}-->'); return false;">上へ</a>
           <!--{/if}-->
-          <!--{if !($smarty.section.cnt.last && $tpl_disppage eq $tpl_pagemax) }-->
+          <!--{if !($smarty.section.cnt.last && $tpl_disppage eq $tpl_pagemax)}-->
           <a href="?" onclick="fnModeSubmit('down','product_id', '<!--{$arrProductsList[cnt].product_id}-->'); return false;">下へ</a>
           <!--{/if}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl	(revision 20049)
@@ -129,5 +129,5 @@
   <!--{include file=$tpl_pager}-->
   
-  <!--{ if $arrReview > 0 & $tpl_linemax > 0 }-->
+  <!--{if $arrReview > 0 & $tpl_linemax > 0}-->
   <!--検索結果表示テーブル-->
   <table id="products-review-result" class="list">
@@ -156,7 +156,7 @@
   </table>
   <!--検索結果表示テーブル-->
-  <!--{ /if }-->
+  <!--{/if}-->
 </form>
-<!--{ /if }-->
+<!--{/if}-->
 <!--★★検索結果一覧★★-->
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl	(revision 20049)
@@ -129,5 +129,5 @@
   <!--{include file=$tpl_pager}-->
   
-  <!--{ if $arrTrackback > 0 & $tpl_linemax > 0 }-->
+  <!--{if $arrTrackback > 0 & $tpl_linemax > 0}-->
   <!--{* 検索結果表示テーブル *}-->
   <table class="list" id="products-trackback-result">
@@ -155,7 +155,7 @@
   </table>
   <!--{* 検索結果表示テーブル *}-->
-  <!--{ /if }-->
+  <!--{/if}-->
 </form>
-<!--{ /if }-->
+<!--{/if}-->
 <!--★★検索結果一覧★★-->    
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 20049)
@@ -41,5 +41,5 @@
             <td>
                 <input type="text" name="bloc_name" value="<!--{$arrBlocData.bloc_name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.bloc_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
-                <!--{ if $arrErr.bloc_name != "" }--> <div align="center"> <span class="attention"><!--{$arrErr.bloc_name}--></span></div> <!--{/if}-->
+                <!--{if $arrErr.bloc_name != ""}--> <div align="center"> <span class="attention"><!--{$arrErr.bloc_name}--></span></div> <!--{/if}-->
             </td>
         </tr>
@@ -47,5 +47,5 @@
             <th>ファイル名</th>
             <td><input type="text" name="filename" value="<!--{$arrBlocData.filename|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.filename != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" />.tpl<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
-        <!--{ if $arrErr.filename != "" }--> <div align="center"> <span class="attention"><!--{$arrErr.filename}--></span></div> <!--{/if}-->
+        <!--{if $arrErr.filename != ""}--> <div align="center"> <span class="attention"><!--{$arrErr.filename}--></span></div> <!--{/if}-->
          </td>
      </tr>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	(revision 19983)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	(revision 20049)
@@ -320,5 +320,5 @@
         <div class="btn-area">
             <ul>
-                <li><a class="btn-action" href="javascript:;" name='preview' onclick="doPreview();"<!--{if $page_id == "0" or $exists_page == "0" }--> DISABLED<!--{/if}-->><span class="btn-prev">プレビュー</span></a></li>
+                <li><a class="btn-action" href="javascript:;" name='preview' onclick="doPreview();"<!--{if $page_id == "0" or $exists_page == "0"}--> DISABLED<!--{/if}-->><span class="btn-prev">プレビュー</span></a></li>
                 <li><a class="btn-action" href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','confirm','',''); return false;"><span class="btn-next">登録する</span></a></li>
             </ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl	(revision 20049)
@@ -34,5 +34,5 @@
       <th>CSSファイル名</th>
       <td>
-        <!--{ if $arrErr.css_name != "" }--><span class="attention"><!--{$arrErr.css_name}--></span><br /><!--{/if}-->
+        <!--{if $arrErr.css_name != ""}--><span class="attention"><!--{$arrErr.css_name}--></span><br /><!--{/if}-->
         <input type="text" name="css_name" value="<!--{$css_name}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.css_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" />.css<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
       </td>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl	(revision 20049)
@@ -31,13 +31,13 @@
   <h2>ヘッダー編集</h2>
   <!--{* プレビューここから *}-->
-  <!--{ if $header_prev == "on"}-->
+  <!--{if $header_prev == "on"}-->
   <dic id="design-header-preview">
-    <!--{if $browser_type == 1 }-->
+    <!--{if $browser_type == 1}-->
       <div style="zoom:0.8"><!--{include file="`$smarty.const.USER_REALDIR`include/preview/header.tpl"}--></div>
-    <!--{ else }-->
+    <!--{else}-->
       <span class="attention"><strong>プレビューはIEでのみ表示されます。</strong></span>
-    <!--{ /if }-->
+    <!--{/if}-->
   </div>
-  <!--{ /if }-->
+  <!--{/if}-->
   <!--{* プレビューここまで *}-->
     
@@ -66,13 +66,13 @@
   <!--{* ▼フッター編集ここから *}-->
   <h2>フッター編集</h2>
-  <!--{ if $footer_prev == "on"}-->
+  <!--{if $footer_prev == "on"}-->
   <div id="design-footer-preview">
-    <!--{if $browser_type == 1 }-->
+    <!--{if $browser_type == 1}-->
       <div style="zoom:0.8"><!--{include file="`$smarty.const.USER_REALDIR`/include/preview/footer.tpl"}--></div>
-    <!--{ else }-->
+    <!--{else}-->
       <span class="attention"><strong>プレビューはIEでのみ表示されます。</strong></span>
-    <!--{ /if }-->
+    <!--{/if}-->
   </div>
-  <!--{ /if }-->
+  <!--{/if}-->
 
   <form name="form_footer" id="form_footer" method="post" action="?" >
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 19998)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 20049)
@@ -64,5 +64,5 @@
                     <input type="text" name="page_name" value="<!--{$arrPageData.page_name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.page_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
                 <!--{/if}-->
-                <!--{ if $arrErr.page_name != "" }-->
+                <!--{if $arrErr.page_name != ""}-->
                     <div class="message">
                         <span class="attention"><!--{$arrErr.page_name}--></span>
@@ -80,5 +80,5 @@
                     <!--{$user_URL|h}--><input type="text" name="url" value="<!--{$arrPageData.directory|h}--><!--{$arrPageData.filename|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.url != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> ime-mode: disabled;" size="40" class="box40" />.php<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
                 <!--{/if}-->
-                <!--{ if $arrErr.url != "" }-->
+                <!--{if $arrErr.url != ""}-->
                     <div class="attention">
                         <span class="attention"><!--{$arrErr.url}--></span>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl	(revision 20049)
@@ -43,5 +43,5 @@
   <h2>ステータス変更</h2>
   <!--{* 登録テーブルここから *}-->
-  <!--{if $tpl_linemax > 0 }-->
+  <!--{if $tpl_linemax > 0}-->
   <div class="btn">
     <select name="change_status">
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl	(revision 20013)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl	(revision 20049)
@@ -278,5 +278,5 @@
 </form>
 
-<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete') }-->
+<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete')}-->
 
 <!--★★検索結果一覧★★-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 20049)
@@ -249,5 +249,5 @@
 
 
-<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete' or $smarty.post.mode == 'back') }-->
+<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete' or $smarty.post.mode == 'back')}-->
 
 <form name="form1" id="form1" method="post" action="?">
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/plugin.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/plugin.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/plugin.tpl	(revision 20049)
@@ -23,5 +23,5 @@
       <td><!--{$plugins[data].plugin_name|h}--></td>
       <td>
-        <!--{if $plugins[data].create_date == null }-->
+        <!--{if $plugins[data].create_date == null}-->
         <input type="hidden" name="plugin_name" value="<!--{$plugins[data].plugin_name}-->" />
            <a class="btn-normal" href="javascript:;" name="install" onclick="fnModeSubmit('install','',''); return false;">install</a>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 20049)
@@ -56,5 +56,5 @@
     <h2>バックアップ一覧</h2>
     <!--{* 一覧が存在する場合のみ表示する *}-->
-    <!--{if count($arrBkupList) > 0 }-->
+    <!--{if count($arrBkupList) > 0}-->
     <table class="list">
         <tr>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl	(revision 19977)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl	(revision 20049)
@@ -55,9 +55,9 @@
       <td><!--{$list_data[data].department|h}--></td>
       <td align="center"><a href="#" onClick="win01('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','615','450'); return false;">編集</a></td>
-      <td align="center"><!--{if $workmax > 1 }--><a href="#" onClick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
+      <td align="center"><!--{if $workmax > 1}--><a href="#" onClick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
       <td align="center">
       <!--{$tpl_nomove}-->
-      <!--{if !($smarty.section.data.first && $tpl_disppage eq 1) }--><a href="./rank.php?id=<!--{$list_data[data].member_id}-->&move=up&pageno=<!--{$tpl_disppage}-->">上へ</a><!--{/if}-->
-      <!--{if !($smarty.section.data.last && $tpl_disppage eq $tpl_pagemax) }--><a href="./rank.php?id=<!--{$list_data[data].member_id}-->&move=down&pageno=<!--{$tpl_disppage}-->">下へ</a><!--{/if}-->
+      <!--{if !($smarty.section.data.first && $tpl_disppage eq 1)}--><a href="./rank.php?id=<!--{$list_data[data].member_id}-->&move=up&pageno=<!--{$tpl_disppage}-->">上へ</a><!--{/if}-->
+      <!--{if !($smarty.section.data.last && $tpl_disppage eq $tpl_pagemax)}--><a href="./rank.php?id=<!--{$list_data[data].member_id}-->&move=down&pageno=<!--{$tpl_disppage}-->">下へ</a><!--{/if}-->
       </td>
     </tr>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 19998)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 20049)
@@ -59,15 +59,15 @@
                     <td><a<!--{if $orderDetail.enable}--> href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$orderDetail.product_id|u}-->"<!--{/if}-->><!--{$orderDetail.product_name|h}--></a></td>
                     <td>
-                    <!--{ if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
-                        <!--{ if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
+                    <!--{if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
+                        <!--{if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
                             <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
-                        <!--{ elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
+                        <!--{elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
                             ダウンロード商品<BR />（入金確認中）
-                        <!--{ elseif $orderDetail.effective != "1"}-->
+                        <!--{elseif $orderDetail.effective != "1"}-->
                             ダウンロード商品<BR />（期限切れ）
-                        <!--{ /if }-->
-                    <!--{ else if $orderDetail.product_type_id == PRODUCT_TYPE_NORMAL}-->
+                        <!--{/if}-->
+                    <!--{else if $orderDetail.product_type_id == PRODUCT_TYPE_NORMAL}-->
                             通常商品
-                    <!--{ /if }-->
+                    <!--{/if}-->
                     </td>
                     <!--{assign var=price value=`$orderDetail.price`}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl	(revision 19998)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl	(revision 20049)
@@ -27,5 +27,5 @@
 
     <!-- ▼その他決済情報を表示する場合は表示 -->
-    <!--{if $arrOther.title.value }-->
+    <!--{if $arrOther.title.value}-->
     <p><em>■<!--{$arrOther.title.name}-->情報</em><br />
         <!--{foreach key=key item=item from=$arrOther}-->
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 20014)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 20049)
@@ -72,5 +72,5 @@
             <input type="hidden" name="cart_no" value="" />
             <input type="hidden" name="cartKey" value="<!--{$key}-->" />
-            <!--{if count($cartKeys) > 1 }-->
+            <!--{if count($cartKeys) > 1}-->
             <h3><!--{$arrProductType[$key]}--></h3>
                 <p>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	(revision 19943)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	(revision 20049)
@@ -49,5 +49,5 @@
           <!--{/if}-->
           
-          <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> onmark<!--{/if}-->"><span class="category_header"></span><span class="category_body"><a href="<!--{$smarty.const.SMARTPHONE_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a></span>
+          <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> onmark<!--{/if}-->"><span class="category_header"></span><span class="category_body"><a href="<!--{$smarty.const.SMARTPHONE_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a></span>
             <!--{if $firstdone == 0}--><!--{assign var=firstdone value=1}--><!--{/if}-->
             <!--{assign var=preLev value=`$level`}-->
@@ -55,5 +55,5 @@
             <!--{* セクションの最後に閉じタグを追加 *}-->
             <!--{if $smarty.section.cnt.last}-->
-                <!--{if $preLev-1 > 0 }-->
+                <!--{if $preLev-1 > 0}-->
                     <!--{section name=d loop=`$preLev-1`}-->
                         </li>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	(revision 19983)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	(revision 20049)
@@ -47,5 +47,5 @@
           <tr>
             <th>性別</th>
-            <td><!--{if $arrForm.sex eq 1 }-->男性<!--{elseif $arrForm.sex eq 2 }-->女性<!--{/if}--></td>
+            <td><!--{if $arrForm.sex eq 1}-->男性<!--{elseif $arrForm.sex eq 2}-->女性<!--{/if}--></td>
           </tr>
           <tr>
Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	(revision 19983)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	(revision 20049)
@@ -44,5 +44,5 @@
                     </li>
                 <!--{/if}-->
-            <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> onmark<!--{/if}-->"><a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id) }--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
+            <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> onmark<!--{/if}-->"><a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
             <!--{if $firstdone == 0}--><!--{assign var=firstdone value=1}--><!--{/if}-->
             <!--{assign var=preLev value=`$level`}-->
@@ -50,5 +50,5 @@
             <!--{* セクションの最後に閉じタグを追加 *}-->
             <!--{if $smarty.section.cnt.last}-->
-                <!--{if $preLev-1 > 0 }-->
+                <!--{if $preLev-1 > 0}-->
                     <!--{section name=d loop=`$preLev-1`}-->
                         </li>
Index: branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl	(revision 19983)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl	(revision 20049)
@@ -47,5 +47,5 @@
           <tr>
             <th>性別</th>
-            <td><!--{if $arrForm.sex eq 1 }-->男性<!--{elseif $arrForm.sex eq 2 }-->女性<!--{/if}--></td>
+            <td><!--{if $arrForm.sex eq 1}-->男性<!--{elseif $arrForm.sex eq 2}-->女性<!--{/if}--></td>
           </tr>
           <tr>
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 20032)
+++ branches/version-2_5-dev/data/Smarty/templates/default/rss/index.tpl	(revision 20049)
@@ -36,10 +36,10 @@
         <!--{section name=cnt loop=$arrNews}-->
             <item>
-                <!--{if $arrNews[cnt].news_url == '' }-->
+                <!--{if $arrNews[cnt].news_url == ''}-->
                     <link><!--{$smarty.const.HTTP_URL}--></link>
                 <!--{else}-->
                     <link><!--{$arrNews[cnt].news_url|h}--></link>
                 <!--{/if}-->
-                <title><!--{ $arrNews[cnt].news_title|sfMbConvertEncoding:$encode|escape }--></title>
+                <title><!--{$arrNews[cnt].news_title|sfMbConvertEncoding:$encode|escape}--></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/mypage/history.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 19998)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 20049)
@@ -59,15 +59,15 @@
                     <td><a<!--{if $orderDetail.enable}--> href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$orderDetail.product_id|u}-->"<!--{/if}-->><!--{$orderDetail.product_name|h}--></a></td>
                     <td>
-                    <!--{ if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
-                        <!--{ if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
+                    <!--{if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
+                        <!--{if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
                             <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
-                        <!--{ elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
+                        <!--{elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
                             ダウンロード商品<BR />（入金確認中）
-                        <!--{ elseif $orderDetail.effective != "1"}-->
+                        <!--{elseif $orderDetail.effective != "1"}-->
                             ダウンロード商品<BR />（期限切れ）
-                        <!--{ /if }-->
-                    <!--{ else if $orderDetail.product_type_id == PRODUCT_TYPE_NORMAL}-->
+                        <!--{/if}-->
+                    <!--{else if $orderDetail.product_type_id == PRODUCT_TYPE_NORMAL}-->
                             通常商品
-                    <!--{ /if }-->
+                    <!--{/if}-->
                     </td>
                     <!--{assign var=price value=`$orderDetail.price`}-->
Index: branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl	(revision 19998)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl	(revision 20049)
@@ -29,5 +29,5 @@
 
     <!-- ▼その他決済情報を表示する場合は表示 -->
-    <!--{if $arrOther.title.value }-->
+    <!--{if $arrOther.title.value}-->
     <p><em>■<!--{$arrOther.title.name}-->情報</em><br />
         <!--{foreach key=key item=item from=$arrOther}-->
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 19983)
+++ branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	(revision 20049)
@@ -70,5 +70,5 @@
             <input type="hidden" name="cart_no" value="" />
             <input type="hidden" name="cartKey" value="<!--{$key}-->" />
-            <!--{if count($cartKeys) > 1 }-->
+            <!--{if count($cartKeys) > 1}-->
             <h3><!--{$arrProductType[$key]}--></h3>
                 <p>
Index: branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 19978)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 20049)
@@ -33,5 +33,5 @@
 メッセージ：<!--{$Message_tmp}-->
 
-<!--{if $arrOther.title.value }-->
+<!--{if $arrOther.title.value}-->
 ******************************************************************
 　<!--{$arrOther.title.name}-->情報