diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-01-20 00:20:46 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-01-20 00:20:46 +0000 |
| commit | f98ca7ce48f5c6fbdde428ee2d1ead7bd8d43772 (patch) | |
| tree | f23b14d3344789bd185b6f3df72c260587b3149b /phpBB | |
| parent | 77af6caed7300c7498016b4b3d30d31f2bcca730 (diff) | |
| download | forums-f98ca7ce48f5c6fbdde428ee2d1ead7bd8d43772.tar forums-f98ca7ce48f5c6fbdde428ee2d1ead7bd8d43772.tar.gz forums-f98ca7ce48f5c6fbdde428ee2d1ead7bd8d43772.tar.bz2 forums-f98ca7ce48f5c6fbdde428ee2d1ead7bd8d43772.tar.xz forums-f98ca7ce48f5c6fbdde428ee2d1ead7bd8d43772.zip | |
Make sure captcha factory is there. Make sure language array is there.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10431 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/captcha/plugins/captcha_abstract.php | 5 |
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) { |