aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/session.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-03 16:34:25 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-29 02:14:39 +0200
commited8c16bf0ddb8fc8723aa870607f255d80aab55b (patch)
tree8230887fdbf074f0748c37e9c31ab1f53ef7c034 /phpBB/phpbb/session.php
parentd1fb8d3c9e9e154d356d4764b592369d0e8ea30f (diff)
downloadforums-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/session.php')
-rw-r--r--phpBB/phpbb/session.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index c35caf5047..093c013e42 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1233,7 +1233,15 @@ class session
$till_date = ($ban_row['ban_end']) ? $this->format_date($ban_row['ban_end']) : '';
$message = ($ban_row['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM';
- $message = sprintf($this->lang[$message], $till_date, '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') . '">', '</a>');
+ if ($config['contact_admin_form_enable'])
+ {
+ $contact_link = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin');
+ }
+ else
+ {
+ $contact_link = 'mailto:' . htmlspecialchars($config['board_contact']);
+ }
+ $message = sprintf($this->lang[$message], $till_date, '<a href="' . $contact_link . '">', '</a>');
$message .= ($ban_row['ban_give_reason']) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : '';
$message .= '<br /><br /><em>' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . '</em>';