diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 16:34:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 02:14:39 +0200 |
| commit | ed8c16bf0ddb8fc8723aa870607f255d80aab55b (patch) | |
| tree | 8230887fdbf074f0748c37e9c31ab1f53ef7c034 /phpBB/phpbb/message/message.php | |
| parent | d1fb8d3c9e9e154d356d4764b592369d0e8ea30f (diff) | |
| download | forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.tar forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.tar.gz forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.tar.bz2 forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.tar.xz forums-ed8c16bf0ddb8fc8723aa870607f255d80aab55b.zip | |
[ticket/10073] Fallback to board_contact when contact page is disabled
PHPBB3-10073
Diffstat (limited to 'phpBB/phpbb/message/message.php')
| -rw-r--r-- | phpBB/phpbb/message/message.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 332604cc8e..182995ba21 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -234,7 +234,7 @@ class message * @param string $phpEx * @return null */ - public function send(\messenger $messenger, $phpEx) + public function send(\messenger $messenger, $contact) { if (!sizeof($this->recipients)) { @@ -263,7 +263,7 @@ class message $messenger->subject(htmlspecialchars_decode($this->subject)); $messenger->assign_vars(array( - 'BOARD_CONTACT' => generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin', + 'BOARD_CONTACT' => $contact, 'TO_USERNAME' => htmlspecialchars_decode($recipient['to_name']), 'FROM_USERNAME' => htmlspecialchars_decode($this->sender_name), 'MESSAGE' => htmlspecialchars_decode($this->body)) |