Merge branch 'master' of github.com:gnuboard/yc4s

2013-11-21 11:54:05 +09:00
parent 013eda47ab a52a38b030
commit 710a7c8f07
11 changed files with 81 additions and 31 deletions
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@ -605,7 +605,7 @@ if($is_member) {

    if($row['ad_id']){
        $sql = " update {$g5['g5_shop_order_address_table']}
-                      set ad_default = '1',
+                      set ad_default = '$ad_default',
                          ad_subject = '$ad_subject'
                    where mb_id = '{$member['mb_id']}'
                      and ad_id = '{$row['ad_id']}' ";