From 80c20cc73f5c9fdcaa2f3c425a62bd5cafef672f Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 13 Jun 2013 11:31:56 +0900 Subject: [PATCH] =?UTF-8?q?merge=20=EC=B6=A9=EB=8F=8C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.head.php | 16 +-- adm/admin.menu400.shop_1of2.php | 2 +- adm/admin.menu500.shop_2of2.php | 2 +- adm/auth_list.php | 17 ++- adm/board_list.php | 40 ++++-- adm/boardgroup_list.php | 25 ++-- adm/boardgroupmember_list.php | 31 +++-- adm/mail_list.php | 2 +- adm/mail_select_list.php | 2 +- adm/member_list.php | 51 +++++--- adm/point_list.php | 27 ++-- adm/poll_list.php | 2 +- adm/shop_admin/itemformupdate.php | 2 +- adm/version.php | 38 +++--- css/admin.css | 6 +- lib/shop.lib.php | 20 +-- mobile/shop/cart.php | 15 ++- mobile/shop/kcp/order_approval_form.php | 124 +++++++++---------- mobile/shop/list.php | 2 +- mobile/shop/navigation1.inc.php | 4 +- mobile/shop/orderform.php | 78 +++++++----- mobile/skin/member/shop_basic/login.skin.php | 10 +- shop/cart.php | 20 +-- shop/content.php | 2 +- shop/item.php | 10 +- shop/itemuse.inc.php | 96 -------------- shop/list.php | 2 +- shop/navigation1.inc.php | 4 +- shop/ordercoupon.php | 3 - shop/orderform.php | 64 ++++++---- shop/orderitemcoupon.php | 3 - shop/ordersendcostcoupon.php | 3 - skin/member/shop_basic/login.skin.php | 10 +- skin/outlogin/shop_basic/outlogin.skin.1.php | 10 +- skin/outlogin/shop_basic/outlogin.skin.2.php | 20 +-- skin/poll/shop_basic/poll_result.skin.php | 34 ++--- 36 files changed, 399 insertions(+), 398 deletions(-) delete mode 100644 shop/itemuse.inc.php diff --git a/adm/admin.head.php b/adm/admin.head.php index cc381378f..fb3b2096e 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -118,26 +118,26 @@ function imageview(id, w, h)