From b7ac5d49cdb9817a9745587ee3a4ef081927b823 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 2 Aug 2013 17:26:04 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=83=81?=
 =?UTF-8?q?=ED=92=88=EC=9D=B4=EB=AF=B8=EC=A7=80=EC=88=98=20mod=20=EB=A1=9C?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/categoryform.php       | 2 +-
 adm/shop_admin/categoryformupdate.php | 2 +-
 extend/shop.extend2.php               | 6 ++++++
 install/shop.sql                      | 2 +-
 mobile/shop/list.php                  | 6 +++---
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/adm/shop_admin/categoryform.php b/adm/shop_admin/categoryform.php
index 54eb30510..f71e85cbf 100644
--- a/adm/shop_admin/categoryform.php
+++ b/adm/shop_admin/categoryform.php
@@ -238,7 +238,7 @@ $pg_anchor .= '</ul>';
         <th scope="row"><label for="ca_mobile_list_row">모바일 이미지 수</label></th>
         <td>
             <?php echo help("한 페이지에 출력할 이미지 수를 설정합니다."); ?>
-            <input type="text" name="ca_mobile_list_row" value='<?php echo $ca['ca_mobile_list_row']; ?>' id="ca_mobile_list_row" required class="required frm_input" size="3">
+            <input type="text" name="ca_mobile_list_mod" value='<?php echo $ca['ca_mobile_list_mod']; ?>' id="ca_mobile_list_mod" required class="required frm_input" size="3">
         </td>
     </tr>
     <tr>
diff --git a/adm/shop_admin/categoryformupdate.php b/adm/shop_admin/categoryformupdate.php
index 8ef24a3cf..9af280cda 100644
--- a/adm/shop_admin/categoryformupdate.php
+++ b/adm/shop_admin/categoryformupdate.php
@@ -63,7 +63,7 @@ $sql_common = " ca_skin                 = '$ca_skin',
 				ca_list_row             = '$ca_list_row',
                 ca_mobile_img_width     = '$ca_mobile_img_width',
                 ca_mobile_img_height    = '$ca_mobile_img_height',
-				ca_mobile_list_row      = '$ca_mobile_list_row',
+				ca_mobile_list_mod      = '$ca_mobile_list_mod',
                 ca_sell_email           = '$ca_sell_email',
                 ca_use                  = '$ca_use',
                 ca_stock_qty            = '$ca_stock_qty',
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index fdc1f5fe2..a7246f75c 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -401,6 +401,12 @@ if (!sql_query(" select de_mobile_type1_list_mod from {$g4['shop_default_table']
                     CHANGE `de_mobile_type5_list_row` `de_mobile_type5_list_mod` INT(11) NOT NULL DEFAULT '0' ", true);
 }
 
+// 분류 모바일 필드명 수정
+if(!sql_query(" select ca_mobile_list_mod from {$g4['shop_category_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g4['shop_category_table']}`
+                    CHANGE `ca_mobile_list_row` `ca_mobile_list_mod` INT(11) NOT NULL DEFAULT '0' ", true);
+}
+
 // 과세, 비과세 금액 필드 추가
 if(!sql_query(" select od_tax_mny from {$g4['shop_order_table']} limit 1 ", false)) {
     sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
diff --git a/install/shop.sql b/install/shop.sql
index 7d21a7af6..d65bf0831 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -109,7 +109,7 @@ CREATE TABLE IF NOT EXISTS `shop_category` (
   `ca_mobile_tail_html` text NOT NULL,
   `ca_list_mod` int(11) NOT NULL DEFAULT '0',
   `ca_list_row` int(11) NOT NULL DEFAULT '0',
-  `ca_mobile_list_row` int(11) NOT NULL DEFAULT '0',
+  `ca_mobile_list_mod` int(11) NOT NULL DEFAULT '0',
   `ca_include_head` varchar(255) NOT NULL DEFAULT '',
   `ca_include_tail` varchar(255) NOT NULL DEFAULT '',
   `ca_mb_id` varchar(255) NOT NULL DEFAULT '',
diff --git a/mobile/shop/list.php b/mobile/shop/list.php
index 22097bff5..9ee6412c9 100644
--- a/mobile/shop/list.php
+++ b/mobile/shop/list.php
@@ -84,14 +84,14 @@ if ($is_admin)
         echo '</div>';
         */
 
-        // 총몇개 = 한줄에 몇개 * 몇줄
-        $items = $ca['ca_list_mod'] * $ca['ca_list_row'];
+        // 총몇개
+        $items = $ca['ca_mobile_list_mod'];
         // 페이지가 없으면 첫 페이지 (1 페이지)
         if ($page == "") $page = 1;
         // 시작 레코드 구함
         $from_record = ($page - 1) * $items;
 
-        $list = new item_list($ca['ca_skin'], $ca['ca_list_mod'], $ca['ca_list_row'], $ca['ca_img_width'], $ca['ca_img_height']);
+        $list = new item_list($ca['ca_mobile_skin'], $ca['ca_mobile_list_mod'], 1, $ca['ca_mobile_img_width'], $ca['ca_mobile_img_height']);
         $list->set_category($ca['ca_id']);
         $list->set_is_page(true);
         $list->set_from_record($from_record);