diff options
| author | Andy Chase <asperous2@gmail.com> | 2013-07-22 11:29:36 -0700 |
|---|---|---|
| committer | Andy Chase <asperous2@gmail.com> | 2013-07-22 11:29:36 -0700 |
| commit | e2a769ac79ad408e94935c97a5fc1325fb838c4f (patch) | |
| tree | 5f56bbc9d9290f49a6c88987561f345df49f8a3c /phpBB/includes/captcha | |
| parent | cc1aef47fb4f5d37415436c62067ad2dcde768bb (diff) | |
| parent | b71038486e067daf0c608d73aabeb60a56e86840 (diff) | |
| download | forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar.gz forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar.bz2 forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.tar.xz forums-e2a769ac79ad408e94935c97a5fc1325fb838c4f.zip | |
Merge branch 'develop' into ticket/11620
Diffstat (limited to 'phpBB/includes/captcha')
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php index ec7636f511..6843f25d72 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php @@ -110,12 +110,8 @@ class phpbb_captcha_qa */ static public function is_installed() { - global $db, $phpbb_root_path, $phpEx; + global $db; - if (!class_exists('phpbb_db_tools', false)) - { - include("$phpbb_root_path/includes/db/db_tools.$phpEx"); - } $db_tool = new phpbb_db_tools($db); return $db_tool->sql_table_exists(CAPTCHA_QUESTIONS_TABLE); @@ -297,12 +293,8 @@ class phpbb_captcha_qa */ function install() { - global $db, $phpbb_root_path, $phpEx; + global $db; - if (!class_exists('phpbb_db_tools')) - { - include("$phpbb_root_path/includes/db/db_tools.$phpEx"); - } $db_tool = new phpbb_db_tools($db); $tables = array(CAPTCHA_QUESTIONS_TABLE, CAPTCHA_ANSWERS_TABLE, CAPTCHA_QA_CONFIRM_TABLE); |