aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Schramm <oliver.schramm97@gmail.com>2014-07-15 22:19:56 +0200
committerOliver Schramm <oliver.schramm97@gmail.com>2014-07-15 22:19:56 +0200
commit021adcc14fb2f968825f746b642a75962d4c9745 (patch)
tree152e02edc2ad741bf3ea8cd72532cb817d5466be
parentfcf426ad5c21c0e1e32e2bc33a8fd0a330fbd273 (diff)
downloadforums-021adcc14fb2f968825f746b642a75962d4c9745.tar
forums-021adcc14fb2f968825f746b642a75962d4c9745.tar.gz
forums-021adcc14fb2f968825f746b642a75962d4c9745.tar.bz2
forums-021adcc14fb2f968825f746b642a75962d4c9745.tar.xz
forums-021adcc14fb2f968825f746b642a75962d4c9745.zip
[ticket/12854] Don't show contact page link if board emails are disabled
PHPBB3-12854
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 158bf1cbc0..8b9969aced 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4955,7 +4955,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'U_SEARCH_UNREAD' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unreadposts'),
'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'),
'U_DELETE_COOKIES' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'),
- 'U_CONTACT_US' => ($config['contact_admin_form_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') : '',
+ 'U_CONTACT_US' => ($config['contact_admin_form_enable'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') : '',
'U_TEAM' => ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'),
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
@@ -5355,7 +5355,7 @@ function phpbb_get_board_contact(\phpbb\config\config $config, $phpEx)
*/
function phpbb_get_board_contact_link(\phpbb\config\config $config, $phpbb_root_path, $phpEx)
{
- if ($config['contact_admin_form_enable'])
+ if ($config['contact_admin_form_enable'] && $config['email_enable'])
{
return append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin');
}