firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-13 18:35:48 +09:00
parent 6f1a1fe673 0a65cb82c4
commit a857025b28
9 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/gcaptcha/fonts/.htaccess
View File

@ -1,4 +0,0 @@
<Files ~ "*">
Order allow,deny
Deny from all
</Files>

2
plugin/kcp/kcpcert_result.php
View File

@ -150,7 +150,7 @@ if( $cert_enc_use == "Y" )
$adult_day = date("Ymd", strtotime("-19 years", G4_SERVER_TIME));
$adult = ((int)$birth_day <= (int)$adult_day) ? 1 : 0;
$sql = " update {$g4['member_table']} set mb_name = '$user_name', mb_hp = '$phone_no', mb_hp_certify = 1, mb_adult = $adult where mb_id = '{$member['mb_id']}' ";
$sql = " update {$g4['member_table']} set mb_name = '$user_name', mb_hp = '$phone_no', mb_hp_certify = 1, mb_adult = $adult, mb_birth = '$birth_day', mb_sex = '$sex_code' where mb_id = '{$member['mb_id']}' ";
sql_query($sql);
}
else if( $res_cd != "0000" )