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

g5 merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2014-01-03 14:35:35 +09:00
parent 5afc9eab34 b2251d9ea8
commit f26b0c838b
23 changed files with 101 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bbs/register_form_update.php
View File

@ -35,6 +35,7 @@ $mb_zip1 = isset($_POST['mb_zip1']) ? escape_trim($_POST['mb_zip
$mb_zip2 = isset($_POST['mb_zip2']) ? escape_trim($_POST['mb_zip2']) : "";
$mb_addr1 = isset($_POST['mb_addr1']) ? escape_trim($_POST['mb_addr1']) : "";
$mb_addr2 = isset($_POST['mb_addr2']) ? escape_trim($_POST['mb_addr2']) : "";
$mb_addr3 = isset($_POST['mb_addr3']) ? escape_trim($_POST['mb_addr3']) : "";
$mb_addr_jibeon = isset($_POST['mb_addr_jibeon']) ? escape_trim($_POST['mb_addr_jibeon']) : "";
$mb_signature = isset($_POST['mb_signature']) ? escape_trim($_POST['mb_signature']) : "";
$mb_profile = isset($_POST['mb_profile']) ? escape_trim($_POST['mb_profile']) : "";
@ -52,6 +53,8 @@ $mb_8 = isset($_POST['mb_8']) ? escape_trim($_POST['mb_8']
$mb_9 = isset($_POST['mb_9']) ? escape_trim($_POST['mb_9']) : "";
$mb_10 = isset($_POST['mb_10']) ? escape_trim($_POST['mb_10']) : "";
// 상세주소처리
$mb_addr2 = get_address2($mb_addr2, $mb_addr3);
if ($w == '' || $w == 'u') {