From f80109652caadd3a67687e36977c9c3b2b5c726a Mon Sep 17 00:00:00 2001 From: nishizoe Date: Mon, 16 Jan 2017 19:31:29 +0900 Subject: [PATCH] =?UTF-8?q?(fixed=20#4137,=20BP=20from=20#2922)=20PC?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E3=82=A2=E3=83=89=E3=83=AC=E3=82=B9?= =?UTF-8?q?=E3=81=B8=E3=81=AE=E3=82=B3=E3=83=9F=E3=83=A5=E3=83=8B=E3=83=86?= =?UTF-8?q?=E3=82=A3=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E3=81=AE=20from=20=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=82=A2=E3=83=89=E3=83=AC=E3=82=B9=20?= =?UTF-8?q?=E3=82=92=E7=AE=A1=E7=90=86=E8=80=85=E3=83=A1=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=82=A2=E3=83=89=E3=83=AC=E3=82=B9=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/opCommunityTopicToolKit.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/opCommunityTopicToolKit.class.php b/lib/opCommunityTopicToolKit.class.php index 17a5f33..ce1bc82 100644 --- a/lib/opCommunityTopicToolKit.class.php +++ b/lib/opCommunityTopicToolKit.class.php @@ -43,19 +43,20 @@ static public function sendNotificationMail(Community $community, $id, $type, $n $member = $r->getMember(); $memberPcAddress = $member->getConfig('pc_address'); $memberMobileAddress = $member->getConfig('mobile_address'); - $from = self::getPostMailAddress('mail_community_'.$type.'_comment_create', array( - 'id' => $id, - 'hash' => $member->getMailAddressHash(), - )); if ($r->getIsReceiveMailPc() && $memberPcAddress) { + $from = opConfig::get('admin_mail_address'); $params['url'] = app_url_for('pc_frontend', '@community'.ucfirst($type).'_show?id='.$id, true); opMailSend::sendTemplateMail('notifyCommunityPosting', $memberPcAddress, $from, $params); } if ($r->getIsReceiveMailMobile() && $memberMobileAddress) { + $from = self::getPostMailAddress('mail_community_'.$type.'_comment_create', array( + 'id' => $id, + 'hash' => $member->getMailAddressHash(), + )); $params['url'] = app_url_for('mobile_frontend', '@community'.ucfirst($type).'_show?id='.$id, true); opMailSend::sendTemplateMail('notifyCommunityPosting', $memberMobileAddress, $from, $params); }