aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.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/includes/functions.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/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index e66fd69f83..026dd949fb 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2814,11 +2814,20 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
break;
case LOGIN_ERROR_PASSWORD_CONVERT:
+ if ($config['contact_admin_form_enable'])
+ {
+ $contact_link = append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword');
+ }
+ else
+ {
+ $contact_link = 'mailto:' . htmlspecialchars($config['board_contact']);
+ }
+
$err = sprintf(
$user->lang[$result['error_msg']],
($config['email_enable']) ? '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') . '">' : '',
($config['email_enable']) ? '</a>' : '',
- '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') . '">',
+ '<a href="' . $contact_link . '">',
'</a>'
);
break;