Merge pull request EC-CUBE#220 from nobuhiko/fix#156-sp-3

fix EC-CUBE#156 ページを開くごとに大量のWarningが発生する(スマホ)
seasoftjapan · Aug 17, 2018 · 212fb1f · 212fb1f
2 parents a124e60 + 049f430
commit 212fb1f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/data/Smarty/templates/sphone/site_frame.tpl b/data/Smarty/templates/sphone/site_frame.tpl
@@ -85,7 +85,7 @@
         //]]></script>
 
         <!--{* ▼Head COLUMN *}-->
-            <!--{if $arrPageLayout.HeadNavi|@count > 0}-->
+            <!--{if !empty($arrPageLayout.HeadNavi)}-->
                 <!--{foreach key=HeadNaviKey item=HeadNaviItem from=$arrPageLayout.HeadNavi}-->
                     <!--{* ▼<!--{$HeadNaviItem.bloc_name}--> *}-->
                         <!--{if $HeadNaviItem.php_path != ""}-->

diff --git a/data/Smarty/templates/sphone/site_main.tpl b/data/Smarty/templates/sphone/site_main.tpl
@@ -24,7 +24,7 @@
     <div data-role="page" data-keep-native=".data-role-none" data-theme="f">
 
         <!--{* ▼HeaderHeaderTop COLUMN*}-->
-        <!--{if $arrPageLayout.HeaderTopNavi|@count > 0}-->
+        <!--{if !empty($arrPageLayout.HeaderTopNavi)}-->
             <div class="header_utility">
                 <!--{* ▼上ナビ *}-->
                 <!--{foreach key=HeaderTopNaviKey item=HeaderTopNaviItem from=$arrPageLayout.HeaderTopNavi}-->
@@ -49,7 +49,7 @@
 
 
         <!--{* ▼TOP COLUMN*}-->
-        <!--{if $arrPageLayout.TopNavi|@count > 0}-->
+        <!--{if !empty($arrPageLayout.TopNavi)}-->
             <div class="header_utility">
                 <!--{* ▼上ナビ *}-->
                 <!--{foreach key=TopNaviKey item=TopNaviItem from=$arrPageLayout.TopNavi}-->
@@ -69,7 +69,7 @@
         <!--{* ▼CENTER COLUMN *}-->
         <div id="main-content">
             <!--{* ▼メイン上部 *}-->
-            <!--{if $arrPageLayout.MainHead|@count > 0}-->
+            <!--{if !empty($arrPageLayout.MainHead)}-->
                 <!--{foreach key=MainHeadKey item=MainHeadItem from=$arrPageLayout.MainHead}-->
                     <!-- ▼<!--{$MainHeadItem.bloc_name}--> -->
                     <!--{if $MainHeadItem.php_path != ""}-->
@@ -87,7 +87,7 @@
             <!-- ▲メイン -->
 
             <!--{* ▼メイン下部 *}-->
-            <!--{if $arrPageLayout.MainFoot|@count > 0}-->
+            <!--{if !empty($arrPageLayout.MainFoot)}-->
                 <!--{foreach key=MainFootKey item=MainFootItem from=$arrPageLayout.MainFoot}-->
                     <!-- ▼<!--{$MainFootItem.bloc_name}--> -->
                     <!--{if $MainFootItem.php_path != ""}-->
@@ -103,7 +103,7 @@
         <!--{* ▲CENTER COLUMN *}-->
 
         <!--{* ▼BOTTOM COLUMN*}-->
-        <!--{if $arrPageLayout.BottomNavi|@count > 0}-->
+        <!--{if !empty($arrPageLayout.BottomNavi)}-->
             <div id="footer_utility">
                 <!--{* ▼下ナビ *}-->
                 <!--{foreach key=BottomNaviKey item=BottomNaviItem from=$arrPageLayout.BottomNavi}-->
@@ -128,7 +128,7 @@
         <!--{* ▲FOOTER *}-->
 
         <!--{* ▼FooterBottom COLUMN*}-->
-        <!--{if $arrPageLayout.FooterBottomNavi|@count > 0}-->
+        <!--{if !empty($arrPageLayout.FooterBottomNavi)}-->
             <div id="footerbottomcolumn">
                 <!--{* ▼上ナビ *}-->
                 <!--{foreach key=FooterBottomNaviKey item=FooterBottomNaviItem from=$arrPageLayout.FooterBottomNavi}-->

diff --git a/data/class/helper/SC_Helper_PageLayout.php b/data/class/helper/SC_Helper_PageLayout.php
@@ -377,9 +377,9 @@ public function getColumnNum($arrPageLayout)
         // メインは確定
         $col_num = 1;
         // LEFT NAVI
-        if (count($arrPageLayout['LeftNavi']) > 0) $col_num++;
+        if (!empty($arrPageLayout['LeftNavi'])) $col_num++;
         // RIGHT NAVI
-        if (count($arrPageLayout['RightNavi']) > 0) $col_num++;
+        if (!empty($arrPageLayout['RightNavi'])) $col_num++;
         return $col_num;
     }
 }