diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 16:57:04 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 02:14:40 +0200 |
| commit | f01e0a2eef0604367620e8b9aa323f3feb86ea3c (patch) | |
| tree | e2dcd7c7f72e0bc80f809d46ae3a6d25278c3508 /phpBB/includes/captcha/plugins | |
| parent | ed8c16bf0ddb8fc8723aa870607f255d80aab55b (diff) | |
| download | forums-f01e0a2eef0604367620e8b9aa323f3feb86ea3c.tar forums-f01e0a2eef0604367620e8b9aa323f3feb86ea3c.tar.gz forums-f01e0a2eef0604367620e8b9aa323f3feb86ea3c.tar.bz2 forums-f01e0a2eef0604367620e8b9aa323f3feb86ea3c.tar.xz forums-f01e0a2eef0604367620e8b9aa323f3feb86ea3c.zip | |
[ticket/10073] Deduplicate the if statement
PHPBB3-10073
Diffstat (limited to 'phpBB/includes/captcha/plugins')
| -rw-r--r-- | phpBB/includes/captcha/plugins/captcha_abstract.php | 9 | ||||
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php index c75a4ffb83..8e1e61bdb7 100644 --- a/phpBB/includes/captcha/plugins/captcha_abstract.php +++ b/phpBB/includes/captcha/plugins/captcha_abstract.php @@ -96,14 +96,7 @@ class phpbb_captcha_plugins_captcha_abstract else { $link = append_sid($phpbb_root_path . 'ucp.' . $phpEx, 'mode=confirm&confirm_id=' . $this->confirm_id . '&type=' . $this->type); - if ($config['contact_admin_form_enable']) - { - $contact_link = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin'); - } - else - { - $contact_link = 'mailto:' . htmlspecialchars($config['board_contact']); - } + $contact_link = phpbb_get_board_contact_link($config, $phpbb_root_path, $phpEx); $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>'); $template->assign_vars(array( diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php index 69864a75ab..12cc49ef9b 100644 --- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php @@ -158,14 +158,7 @@ class phpbb_recaptcha extends phpbb_default_captcha } else { - if ($config['contact_admin_form_enable']) - { - $contact_link = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin'); - } - else - { - $contact_link = 'mailto:' . htmlspecialchars($config['board_contact']); - } + $contact_link = phpbb_get_board_contact_link($config, $phpbb_root_path, $phpEx); $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>'); $template->assign_vars(array( |