diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-13 23:34:44 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 02:14:32 +0200 |
| commit | 35b88624f5f85e3d7ea048e9f537dc477bf913c6 (patch) | |
| tree | 54edd4e4340d84ca42471bc6fe9b4af8bb526a03 | |
| parent | 67cf0a912c8ed24c7466163fa409e8154082e1df (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/message/admin_form.php | 2 |
2 files changed, 2 insertions, 2 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'), diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php index 5201994c73..57564cff12 100644 --- a/phpBB/phpbb/message/admin_form.php +++ b/phpBB/phpbb/message/admin_form.php @@ -35,7 +35,7 @@ class admin_form extends form return $error; } - if (!$this->config['contact_admin_form_enable']) /** TODO: && !$this->config['contact_admin_info']) */ + if (!$this->config['contact_admin_form_enable']) { return 'NO_CONTACT_PAGE'; } |