mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
Fixed bug #465147
git-svn-id: file:///svn/phpbb/trunk@1097 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
ee22f2709c
commit
8a18db2b9d
2 changed files with 6 additions and 0 deletions
|
@ -69,6 +69,9 @@ if( isset($HTTP_POST_VARS['joingroup']) )
|
||||||
|
|
||||||
$email_headers = "From: " . $board_config['board_email'] . "\r\n";
|
$email_headers = "From: " . $board_config['board_email'] . "\r\n";
|
||||||
|
|
||||||
|
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
|
||||||
|
$emailer = new emailer($board_config['smtp_delivery']);
|
||||||
|
|
||||||
$emailer->use_template("group_request");
|
$emailer->use_template("group_request");
|
||||||
$emailer->email_address($moderator[0]['user_email']);
|
$emailer->email_address($moderator[0]['user_email']);
|
||||||
$emailer->set_subject($lang['Group_request']);
|
$emailer->set_subject($lang['Group_request']);
|
||||||
|
|
|
@ -674,6 +674,9 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit")
|
||||||
if($to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']))
|
if($to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']))
|
||||||
{
|
{
|
||||||
$email_headers = "From: " . $board_config['board_email'] . "\r\n";
|
$email_headers = "From: " . $board_config['board_email'] . "\r\n";
|
||||||
|
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
|
||||||
|
$emailer = new emailer($board_config['smtp_delivery']);
|
||||||
|
|
||||||
$emailer->use_template("privmsg_notify");
|
$emailer->use_template("privmsg_notify");
|
||||||
$emailer->email_address($to_userdata['user_email']);
|
$emailer->email_address($to_userdata['user_email']);
|
||||||
$emailer->set_subject($lang['Notification_subject']);
|
$emailer->set_subject($lang['Notification_subject']);
|
||||||
|
|
Loading…
Add table
Reference in a new issue