diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/posting.php | 2 | ||||
| -rw-r--r-- | phpBB/profile.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 60501aeeae..6cd576fc36 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -751,7 +751,7 @@ if( ( $submit || $confirm ) && !$error ) { if( $email_set[$i]['user_email'] != "") { - $email_headers = "From: " . $board_config['email_sig'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; + $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; $emailer->use_template("topic_notify"); $emailer->email_address($email_set[$i]['user_email']); diff --git a/phpBB/profile.php b/phpBB/profile.php index 45ea1d1209..a870fc76a5 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -769,7 +769,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $emailer->assign_vars(array( "SITENAME" => $board_config['sitename'], "USERNAME" => $username, - "EMAIL_SIG" => $board_config['email_sig'], + "EMAIL_SIG" => $board_config['board_email'], "U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey") ); @@ -849,7 +849,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "WELCOME_MSG" => $lang['Welcome_subject'], "USERNAME" => $username, "PASSWORD" => $password_confirm, - "EMAIL_SIG" => $board_config['email_sig'], + "EMAIL_SIG" => $board_config['board_email'], "U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey") ); |