diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:40 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:40 +0100 |
| commit | f0eb18fffd11a97383c8ccf2ae7d2838939f09e2 (patch) | |
| tree | 70790196713789f9cbe4609f9e841f7e69bb6f00 /phpBB/includes/captcha/plugins | |
| parent | 021c186be91095397d4e76801738373989360a52 (diff) | |
| parent | ac5995551ba941b2cb5d98cc86ffe921bedee200 (diff) | |
| download | forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar.gz forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar.bz2 forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.tar.xz forums-f0eb18fffd11a97383c8ccf2ae7d2838939f09e2.zip | |
Merge commit 'release-3.0.6-RC2'
Diffstat (limited to 'phpBB/includes/captcha/plugins')
3 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php index a85566deff..6e899adc16 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php @@ -80,7 +80,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha { return true; } - + function get_name() { return 'CAPTCHA_GD'; @@ -123,6 +123,8 @@ class phpbb_captcha_gd extends phpbb_default_captcha set_config($captcha_var, $value); } } + + add_log('admin', 'LOG_CONFIG_VISUAL'); trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action)); } else if ($submit) @@ -148,7 +150,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha function execute_demo() { global $config; - + $config_old = $config; foreach ($this->captcha_vars as $captcha_var => $template_var) { diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php index 6f53e8c5ad..411d1366fa 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php @@ -56,13 +56,13 @@ class phpbb_captcha_qa $this->answer = request_var('qa_answer', '', true); $this->type = (int) $type; - $this->question_lang = $user->data['user_lang']; + $this->question_lang = $user->lang_name; // we need all defined questions - shouldn't be too many, so we can just grab them // try the user's lang first $sql = 'SELECT question_id FROM ' . CAPTCHA_QUESTIONS_TABLE . " - WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'"; + WHERE lang_iso = '" . $db->sql_escape($user->lang_name) . "'"; $result = $db->sql_query($sql, 3600); while ($row = $db->sql_fetchrow($result)) @@ -685,6 +685,7 @@ class phpbb_captcha_qa $this->acp_add_question($data); } + add_log('admin', 'LOG_CONFIG_VISUAL'); trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($list_url)); } } diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php index 2d37b13a4f..d4543dddfc 100644 --- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php @@ -100,6 +100,8 @@ class phpbb_recaptcha extends phpbb_default_captcha set_config($captcha_var, $value); } } + + add_log('admin', 'LOG_CONFIG_VISUAL'); trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action)); } else if ($submit) |