diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php index 27205e16d..2316d1db5 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -33,7 +33,7 @@ include_once (G4_ADMIN_PATH.'/admin.head.php'); $sql = " select b.od_id, b.*, "._MISU_QUERY_." from {$g4['yc4_cart_table']} a - left join {$g4['yc4_order_table']} b on (a.uq_id="b".od_id) + left join {$g4['yc4_order_table']} b on (a.uq_id=b.od_id) group by b.od_id /*having misu <= 0 and b.od_invoice = '' and ordercancel = 0*/ /*having orderamount - receiptamount = 0 and b.od_invoice = ''*/ @@ -97,7 +97,7 @@ include_once (G4_ADMIN_PATH.'/admin.head.php'); $sql = " select b.od_id, b.*, "._MISU_QUERY_." from {$g4['yc4_cart_table']} a - left join {$g4['yc4_order_table']} b on (a.uq_id="b".od_id) + left join {$g4['yc4_order_table']} b on (a.uq_id=b.od_id) group by b.od_id /* having receiptamount <= 0 */ having misu > 0 diff --git a/bbs/memo_view.php b/bbs/memo_view.php index 0c051a0a2..c07c80e25 100644 --- a/bbs/memo_view.php +++ b/bbs/memo_view.php @@ -63,8 +63,6 @@ else $mb = get_member($memo['me_'.$unkind.'_mb_id']); -$member_skin_path = G4_PATH.'/skin/member/'.$config['cf_member_skin']; - include_once($member_skin_path.'/memo_view.skin.php'); include_once(G4_PATH.'/tail.sub.php'); diff --git a/common.php b/common.php index 46de218ed..4b44e0b7e 100644 --- a/common.php +++ b/common.php @@ -385,6 +385,7 @@ if ($is_admin != 'super') { $board_skin_path = G4_SKIN_PATH.'/board/'.$board['bo_skin']; $board_skin_url = G4_SKIN_URL.'/board/'.$board['bo_skin']; $member_skin_path = G4_SKIN_PATH.'/member/'.$config['cf_member_skin']; +$member_skin_url = G4_SKIN_URL.'/member/'.$config['cf_member_skin']; $new_skin_path = G4_SKIN_PATH.'/new/'.$config['cf_new_skin']; $search_skin_path = G4_SKIN_PATH.'/search/'.$config['cf_search_skin']; $connect_skin_path = G4_SKIN_PATH.'/connect/'.$config['cf_connect_skin']; diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 1f22fbad9..2493d66d3 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -24,7 +24,7 @@ function get_uniqid() sql_query(" LOCK TABLE {$g4['yc4_uniqid_table']} WRITE "); while (1) { // 년월일시분초에 100분의 1초 두자리를 추가함 (1/100 초 앞에 자리가 모자르면 0으로 채움) - $key = date('YmdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT); + $key = date('ymdHis', time()) . str_pad((int)(microtime()*100), 2, "0", STR_PAD_LEFT); $result = sql_query(" insert into {$g4['yc4_uniqid_table']} values ('$key') ", false); if ($result) break; // 쿼리가 정상이면 빠진다.