aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2009-09-15 09:11:17 +0000
committerHenry Sudhof <kellanved@phpbb.com>2009-09-15 09:11:17 +0000
commitffbe4e3b82c402239290f0f9427ec78122539620 (patch)
tree27cf28a4bea82d6179da14b2ecbef0bd8e5f4752 /phpBB
parentbf2133d38038504a455a56ad18ddea2a879ad579 (diff)
downloadforums-ffbe4e3b82c402239290f0f9427ec78122539620.tar
forums-ffbe4e3b82c402239290f0f9427ec78122539620.tar.gz
forums-ffbe4e3b82c402239290f0f9427ec78122539620.tar.bz2
forums-ffbe4e3b82c402239290f0f9427ec78122539620.tar.xz
forums-ffbe4e3b82c402239290f0f9427ec78122539620.zip
sanity check - avoid ugly error messages
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10144 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_captcha.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php
index 6e86f412fb..29f986f8f4 100644
--- a/phpBB/includes/acp/acp_captcha.php
+++ b/phpBB/includes/acp/acp_captcha.php
@@ -30,10 +30,13 @@ class acp_captcha
$user->add_lang('acp/board');
include($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
-
+ $captchas = phpbb_captcha_factory::get_captcha_types();
+
$selected = request_var('select_captcha', $config['captcha_plugin']);
+ $selected = (isset($captchas['available'][$selected]) || isset($captchas['unavailable'][$selected])) ? $selected : $config['captcha_plugin'];
$configure = request_var('configure', false);
+
// Oh, they are just here for the view
if (isset($_GET['captcha_demo']))
{
@@ -49,8 +52,6 @@ class acp_captcha
}
else
{
- $captchas = phpbb_captcha_factory::get_captcha_types();
-
$config_vars = array(
'enable_confirm' => array('tpl' => 'REG_ENABLE', 'default' => false),
'enable_post_confirm' => array('tpl' => 'POST_ENABLE', 'default' => false),