aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-12-31 16:56:15 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-12-31 16:56:15 +0000
commit46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0 (patch)
tree2f8fd4b59b67fa390f3d29ab2a78142d34888ec8 /phpBB/includes/acp
parent54f79e200fdba8e6eee74a0a8aed68a2ca71ec5e (diff)
downloadforums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar
forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar.gz
forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar.bz2
forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar.xz
forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.zip
- telling the admin for what the board contact and board email addresses are used for and also making sure this explanation is correct ;)
- fixes for bugs #6694, #6664 and #6662 git-svn-id: file:///svn/phpbb/trunk@6826 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_email.php1
-rwxr-xr-xphpBB/includes/acp/acp_inactive.php1
-rw-r--r--phpBB/includes/acp/acp_users.php1
3 files changed, 0 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 4f42f5b5b2..991b368a01 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -156,7 +156,6 @@ class acp_email
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->subject(htmlspecialchars_decode($subject));
- $messenger->replyto($config['board_email']);
$messenger->set_mail_priority($priority);
$messenger->assign_vars(array(
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index 5663979f1c..450b9fd0de 100755
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -102,7 +102,6 @@ class acp_inactive
{
$messenger->template('user_remind_inactive', $row['user_lang']);
- $messenger->replyto($config['board_email']);
$messenger->to($row['user_email'], $row['username']);
$messenger->im($row['user_jabber'], $row['username']);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 82017a5871..978bf1947d 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -296,7 +296,6 @@ class acp_users
$messenger->template('user_resend_inactive', $user_row['user_lang']);
- $messenger->replyto($config['board_contact']);
$messenger->to($user_row['user_email'], $user_row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);