Merge branch 'g5'

This commit is contained in:
chicpro
2015-10-02 11:30:31 +09:00
2 changed files with 4 additions and 4 deletions

View File

@ -24,7 +24,7 @@ $sql = " select (TO_DAYS('".G5_TIME_YMDHIS."') - TO_DAYS('{$mb['mb_datetime']}')
$row = sql_fetch($sql); $row = sql_fetch($sql);
$mb_reg_after = $row['days']; $mb_reg_after = $row['days'];
$mb_homepage = set_http(clean_xss_tags($mb['mb_homepage'])); $mb_homepage = set_http(get_text(clean_xss_tags($mb['mb_homepage'])));
$mb_profile = $mb['mb_profile'] ? conv_content($mb['mb_profile'],0) : '소개 내용이 없습니다.'; $mb_profile = $mb['mb_profile'] ? conv_content($mb['mb_profile'],0) : '소개 내용이 없습니다.';
include_once($member_skin_path.'/profile.skin.php'); include_once($member_skin_path.'/profile.skin.php');

View File

@ -2650,9 +2650,9 @@ function module_exec_check($exe, $type)
// 주소출력 // 주소출력
function print_address($addr1, $addr2, $addr3, $addr4) function print_address($addr1, $addr2, $addr3, $addr4)
{ {
$address = trim($addr1); $address = get_text(trim($addr1));
$addr2 = trim($addr2); $addr2 = get_text(trim($addr2));
$addr3 = trim($addr3); $addr3 = get_text(trim($addr3));
if($addr4 == 'N') { if($addr4 == 'N') {
if($addr2) if($addr2)