diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-07-15 23:19:52 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-07-15 23:19:52 +0200 |
| commit | 496b34cd96fb520f98b5fb5d93f1861359b91726 (patch) | |
| tree | 5e6cfc81b4831645e79b37c3bb6a678261dee317 | |
| parent | 389d8e844ed3b192be71e034171bb4506c35c573 (diff) | |
| parent | 021adcc14fb2f968825f746b642a75962d4c9745 (diff) | |
| download | forums-496b34cd96fb520f98b5fb5d93f1861359b91726.tar forums-496b34cd96fb520f98b5fb5d93f1861359b91726.tar.gz forums-496b34cd96fb520f98b5fb5d93f1861359b91726.tar.bz2 forums-496b34cd96fb520f98b5fb5d93f1861359b91726.tar.xz forums-496b34cd96fb520f98b5fb5d93f1861359b91726.zip | |
Merge pull request #2736 from Elsensee/ticket/12854
[ticket/12854] Don't show contact page link if board emails are disabled
* Elsensee/ticket/12854:
[ticket/12854] Don't show contact page link if board emails are disabled
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
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'); } |