aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/auth/auth_db.php5
-rw-r--r--phpBB/includes/captcha/plugins/captcha_abstract.php5
2 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index 13daf3ed61..73c4f92976 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -69,6 +69,11 @@ function login_db(&$username, &$password)
if ($show_captcha)
{
// Visual Confirmation handling
+ if (!class_exists('phpbb_captcha_factory'))
+ {
+ global $phpbb_root_path, $phpEx;
+ include ($phpbb_root_path . 'includes/captcha/captcha_factory.' . $phpEx);
+ }
$captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN);
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
index db4b7649c7..e7b8742b05 100644
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -193,6 +193,11 @@ class phpbb_default_captcha
{
global $config, $db, $user;
+ if (empty($user->lang))
+ {
+ $user->setup();
+ }
+
$error = '';
if (!$this->confirm_id)
{