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-05-29 10:25:46 +09:00
parent aaeb725145 38f209a57d
commit 40b48e92b9
9 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bbs/password_lost2.php
View File

@ -66,8 +66,7 @@ $content .= '<a href="'.$href.'" target="_blank" style="display:block;padding:30
$content .= '</div>';
$content .= '</div>';
$admin = get_admin('super');
mailer($admin['mb_nick'], $admin['mb_email'], $mb['mb_email'], $subject, $content, 1);
mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $mb['mb_email'], $subject, $content, 1);
alert_close($email.' 메일로 회원아이디와 비밀번호를 인증할 수 있는 메일이 발송 되었습니다.\\n\\n메일을 확인하여 주십시오.');
?>

2
bbs/register_email_update.php
View File

@ -35,7 +35,7 @@ include_once ('./register_form_update_mail3.php');
$content = ob_get_contents();
ob_end_clean();
mailer($config['cf_title'], $config['cf_admin_email'], $mb_email, $subject, $content, 1);
mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $mb_email, $subject, $content, 1);
$sql = " update {$g5['member_table']} set mb_email = '$mb_email' where mb_id = '$mb_id' ";
sql_query($sql);

2
bbs/register_form_update.php
View File

@ -265,7 +265,7 @@ if ($w == '') {
$content = ob_get_contents();
ob_end_clean();
mailer($config['cf_title'], $config['cf_admin_email'], $mb_email, $subject, $content, 1);
mailer($config['cf_admin_email_name'], $config['cf_admin_email'], $mb_email, $subject, $content, 1);
// 메일인증을 사용하는 경우 가입메일에 인증 url이 있으므로 인증메일을 다시 발송되지 않도록 함
if($config['cf_use_email_certify'])