From 049f4306b91c2e9a6f8c09b36ba381a9c5bd9fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= <nobuhiko.kimoto@gmail.com>
Date: Thu, 16 Aug 2018 13:59:52 +0900
Subject: [PATCH] =?UTF-8?q?fix=20#156=20=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=82=92=E9=96=8B=E3=81=8F=E3=81=94=E3=81=A8=E3=81=AB=E5=A4=A7?=
 =?UTF-8?q?=E9=87=8F=E3=81=AEWarning=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=99?=
 =?UTF-8?q?=E3=82=8B(=E3=82=B9=E3=83=9E=E3=83=9B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/Smarty/templates/sphone/site_frame.tpl |  2 +-
 data/Smarty/templates/sphone/site_main.tpl  | 12 ++++++------
 data/class/helper/SC_Helper_PageLayout.php  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/Smarty/templates/sphone/site_frame.tpl b/data/Smarty/templates/sphone/site_frame.tpl
index a623b7546f..a34b82f2a1 100755
--- 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
index dc76fb1a91..6f1b822623 100755
--- 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
index 52bbdf75b5..2d080fa5e4 100644
--- 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;
     }
 }