aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-04-13 23:34:44 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-29 02:14:32 +0200
commit35b88624f5f85e3d7ea048e9f537dc477bf913c6 (patch)
tree54edd4e4340d84ca42471bc6fe9b4af8bb526a03 /phpBB/includes
parent67cf0a912c8ed24c7466163fa409e8154082e1df (diff)
downloadforums-35b88624f5f85e3d7ea048e9f537dc477bf913c6.tar
forums-35b88624f5f85e3d7ea048e9f537dc477bf913c6.tar.gz
forums-35b88624f5f85e3d7ea048e9f537dc477bf913c6.tar.bz2
forums-35b88624f5f85e3d7ea048e9f537dc477bf913c6.tar.xz
forums-35b88624f5f85e3d7ea048e9f537dc477bf913c6.zip
[ticket/10073] Remove unneccessary todos he config switch is enough
PHPBB3-10073
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 220f1ae21d..e66fd69f83 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -4922,7 +4922,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']) /** TODO: && !$config['contact_admin_info']) */ ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin'),
+ 'U_CONTACT_US' => ($config['contact_admin_form_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'),