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/includes/acp/acp_email.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/includes/acp/acp_email.php')
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 44489b90fe..4402b6bcf0 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -200,8 +200,17 @@ class acp_email $messenger->subject(htmlspecialchars_decode($subject)); $messenger->set_mail_priority($priority); + if ($config['contact_admin_form_enable']) + { + $contact_link = generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin'; + } + else + { + $contact_link = $config['board_contact']; + } + $messenger->assign_vars(array( - 'CONTACT_EMAIL' => generate_board_url() . '/memberlist.' . $phpEx . '?mode=contactadmin', + 'CONTACT_EMAIL' => $contact_link, 'MESSAGE' => htmlspecialchars_decode($message)) ); |