Merge branch 'g4s'

Conflicts:
	css/admin.css
This commit is contained in:
chicpro
2013-05-03 18:01:15 +09:00
25 changed files with 339 additions and 227 deletions

View File

@ -29,7 +29,9 @@ $sql_common = " mb_name = '{$_POST['mb_name']}',
mb_email = '{$_POST['mb_email']}',
mb_homepage = '{$_POST['mb_homepage']}',
mb_tel = '{$_POST['mb_tel']}',
mb_hp = '$mb_hp',
mb_hp = '{$_POST['mb_hp']}',
mb_hp_certify = '{$_POST['mb_hp_certify']}',
mb_adult = '{$_POST['mb_adult']}',
mb_zip1 = '{$_POST['mb_zip1']}',
mb_zip2 = '{$_POST['mb_zip2']}',
mb_addr1 = '{$_POST['mb_addr1']}',