Merge pull request #501 from nanasess/fix-count-php8

Fix countable fatal error on PHP8
EC-CUBE · Jan 12, 2022 · 41184f2 · 41184f2
2 parents 3fb5ecf + 9ac3699
commit 41184f2
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/data/Smarty/templates/default/cart/index.tpl b/data/Smarty/templates/default/cart/index.tpl
@@ -24,7 +24,7 @@
     <div id="undercolumn_cart">
         <h2 class="title"><!--{$tpl_title|h}--></h2>
 
-        <!--{if $smarty.const.USE_POINT !== false || count($arrProductsClass) > 0}-->
+        <!--{if $smarty.const.USE_POINT !== false || !empty($arrProductsClass)}-->
             <!--★ポイント案内★-->
             <!--{if $smarty.const.USE_POINT !== false}-->
                 <div class="point_announce">

diff --git a/data/Smarty/templates/default/mail_templates/order_mail.tpl b/data/Smarty/templates/default/mail_templates/order_mail.tpl
@@ -84,7 +84,7 @@
 
 　メールアドレス：<!--{$arrOrder.order_email}-->
 
-<!--{if count($arrShipping) >= 1}-->
+<!--{if is_array($arrShipping) && count($arrShipping) >= 1}-->
 ************************************************
 　配送情報
 ************************************************

diff --git a/data/Smarty/templates/default/products/detail.tpl b/data/Smarty/templates/default/products/detail.tpl
@@ -322,7 +322,7 @@
         <div class="review_bloc clearfix">
             <p>この商品に対するご感想をぜひお寄せください。</p>
             <div class="review_btn">
-                <!--{if count($arrReview) < $smarty.const.REVIEW_REGIST_MAX}-->
+                <!--{if is_array($arrReview) && count($arrReview) < $smarty.const.REVIEW_REGIST_MAX}-->
                     <!--★新規コメントを書き込む★-->
                     <a href="./review.php"
                         onclick="eccube.openWindow('./review.php?product_id=<!--{$arrProduct.product_id}-->','review','600','640'); return false;"

diff --git a/data/Smarty/templates/mobile/mail_templates/order_mail.tpl b/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
@@ -75,7 +75,7 @@
 
 　メールアドレス：<!--{$arrOrder.order_email}-->
 
-<!--{if count($arrShipping) >= 1}-->
+<!--{if is_array($arrShipping) && count($arrShipping) >= 1}-->
 ■配送情報
 
 <!--{foreach item=shipping name=shipping from=$arrShipping}-->

diff --git a/data/Smarty/templates/sphone/products/detail.tpl b/data/Smarty/templates/sphone/products/detail.tpl
@@ -373,7 +373,7 @@
             <div class="review_bloc clearfix">
             <p>この商品に対するご感想をぜひお寄せください。</p>
             <div class="review_btn">
-                <!--{if count($arrReview) < $smarty.const.REVIEW_REGIST_MAX}-->
+                <!--{if is_array($arrReview) && count($arrReview) < $smarty.const.REVIEW_REGIST_MAX}-->
                     <!--★新規コメントを書き込む★-->
                     <a href="./review.php?product_id=<!--{$arrProduct.product_id}-->" target="_blank" class="btn_sub">新規コメントを書き込む</a>
                 <!--{/if}-->

diff --git a/data/Smarty/templates/sphone/products/list.tpl b/data/Smarty/templates/sphone/products/list.tpl
@@ -115,7 +115,7 @@
         <!--{include file="frontparts/search_zero.tpl"}-->
     <!--{/foreach}-->
 
-    <!--{if count($arrProducts) < $tpl_linemax}-->
+    <!--{if is_array($arrProducts) && count($arrProducts) < $tpl_linemax}-->
         <div class="btn_area">
             <p><a rel="external" href="javascript: void(0);" class="btn_more" id="btn_more_product" onClick="getProducts(<!--{$disp_number|h}-->); return false;">もっとみる(＋<!--{$disp_number|h}-->件)</a></p>
         </div>