aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message/message.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-06-07 03:46:38 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-29 02:14:28 +0200
commit389bc0b8dd5594a9f66c1026df408dfe73eb65b0 (patch)
tree5bf933be6fc4d6455a60005a7e1070b7e1b19979 /phpBB/includes/message/message.php
parentd52f34f5ec5d006ec7e610e1c72266df21e70ac7 (diff)
downloadforums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.tar
forums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.tar.gz
forums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.tar.bz2
forums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.tar.xz
forums-389bc0b8dd5594a9f66c1026df408dfe73eb65b0.zip
[ticket/10073] Replace board_contact mail with links to contact page
Error pages still contain the email address. PHPBB3-10073
Diffstat (limited to 'phpBB/includes/message/message.php')
-rw-r--r--phpBB/includes/message/message.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/message/message.php b/phpBB/includes/message/message.php
index b0948f940a..1e4f0f65d8 100644
--- a/phpBB/includes/message/message.php
+++ b/phpBB/includes/message/message.php
@@ -17,7 +17,6 @@ if (!defined('IN_PHPBB'))
class phpbb_message
{
- protected $board_contact;
protected $server_name;
protected $subject = '';
@@ -36,9 +35,8 @@ class phpbb_message
protected $recipients;
- public function __construct($board_contact, $server_name)
+ public function __construct($server_name)
{
- $this->board_contact = $board_contact;
$this->server_name = $server_name;
}
@@ -171,7 +169,7 @@ class phpbb_message
$messenger->subject(htmlspecialchars_decode($this->subject));
$messenger->assign_vars(array(
- 'BOARD_CONTACT' => $this->board_contact,
+ 'BOARD_CONTACT' => generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin',
'TO_USERNAME' => htmlspecialchars_decode($recipient['to_name']),
'FROM_USERNAME' => htmlspecialchars_decode($this->sender_name),
'MESSAGE' => htmlspecialchars_decode($this->body))