From 8c4eb7969265a6575bcf2bde0385944f6be89d6f Mon Sep 17 00:00:00 2001
From: takka <takka@tfact.net>
Date: Wed, 6 Sep 2017 16:22:20 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=80=E8=A6=A7/?=
 =?UTF-8?q?=E8=A9=B3=E7=B4=B0=E3=81=A7=E8=A6=8F=E6=A0=BC=E5=90=8D=E3=81=8C?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E7=84=A1=E3=81=84=E3=81=AE?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/SC_Product.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/class/SC_Product.php b/data/class/SC_Product.php
index c5ea95f79e..ca9b102789 100644
--- a/data/class/SC_Product.php
+++ b/data/class/SC_Product.php
@@ -38,9 +38,9 @@ class SC_Product
     public $classCategories = array();
     public $stock_find;
     /** 規格1クラス名 */
-    public $className1 = '';
+    public $className1 = [];
     /** 規格2クラス名 */
-    public $className2 = '';
+    public $className2 = [];
     /** 規格1が設定されている */
     public $classCat1_find;
     /** 規格2が設定されている */
@@ -404,10 +404,10 @@ public function getProductsClass($productClassId)
 
         // 税込計算
         if (!SC_Utils_Ex::isBlank($arrProduct['price01'])) {
-            $arrProduct['price01_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProduct['price01'], $arrProduct['product_id'], $productClassId);        
+            $arrProduct['price01_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProduct['price01'], $arrProduct['product_id'], $productClassId);
         }
         if (!SC_Utils_Ex::isBlank($arrProduct['price02'])) {
-            $arrProduct['price02_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProduct['price02'], $arrProduct['product_id'], $productClassId);        
+            $arrProduct['price02_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProduct['price02'], $arrProduct['product_id'], $productClassId);
         }
 
         return $arrProduct;

From c4132dda4d8865a382d0792ee3506fd528d6a80c Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Mon, 2 Oct 2017 15:31:01 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=AC=E5=BC=A7=E3=81=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/SC_Product.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/class/SC_Product.php b/data/class/SC_Product.php
index ca9b102789..d8a4e57274 100644
--- a/data/class/SC_Product.php
+++ b/data/class/SC_Product.php
@@ -698,7 +698,8 @@ public function getProductDispConditions($tablename = null)
      * @param bool $include_hidden
      * @return array
      */
-    public function getCategoryIds($product_id, $include_hidden = false) {
+    public function getCategoryIds($product_id, $include_hidden = false)
+    {
         if ($this->isValidProductId($product_id, $include_hidden)) {
             $objQuery =& SC_Query_Ex::getSingletonInstance();
             $category_id = $objQuery->getCol('category_id', 'dtb_product_categories', 'product_id = ?', array($product_id));
@@ -718,7 +719,8 @@ public function getCategoryIds($product_id, $include_hidden = false) {
      * @param bool $include_deleted
      * @return bool
      */
-    public function isValidProductId($product_id, $include_hidden = false, $include_deleted = false) {
+    public function isValidProductId($product_id, $include_hidden = false, $include_deleted = false)
+    {
         $where = '';
         if (!$include_hidden) {
             $where .= 'status = 1';