Merge pull request #229 from seasoftjapan/#228

[fix] refs #228 dtb_csv.size_const_type 数値でも設定可能に
EC-CUBE · Aug 30, 2018 · 9f2f6a0 · 9f2f6a0
2 parents 36b8527 + 378a522
commit 9f2f6a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php b/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSV.php
@@ -349,7 +349,7 @@ public function lfInitParam(&$objFormParam, &$arrCSVFrame)
             $objFormParam->addParam(
                     $item['disp_name'],
                     $col,
-                    constant($item['size_const_type']),
+                    defined($item['size_const_type']) ? constant($item['size_const_type']) : $item['size_const_type'],
                     $item['mb_convert_kana_option'],
                     $arrErrorCheckTypes,
                     $item['default'],

diff --git a/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php b/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
@@ -307,7 +307,7 @@ public function lfInitParam(SC_FormParam &$objFormParam, &$arrCSVFrame)
             $objFormParam->addParam(
                     $item['disp_name'],
                     $col,
-                    constant($item['size_const_type']),
+                    defined($item['size_const_type']) ? constant($item['size_const_type']) : $item['size_const_type'],
                     $item['mb_convert_kana_option'],
                     $arrErrorCheckTypes,
                     $item['default'],