aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/captcha/plugins
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-07-14 07:29:29 -0700
committerNils Adermann <naderman@naderman.de>2013-07-14 07:29:29 -0700
commit3d9e57d0cec8f6d7883f8de1e461580047d18709 (patch)
tree4fe7066739fd30e47c3448ef00118562cf72c519 /phpBB/includes/captcha/plugins
parent1e37d97909ccf52b08e2a809ea8a9365c824d8de (diff)
parentf302cbe175e99f90448458f44a499eeb33f75261 (diff)
downloadforums-3d9e57d0cec8f6d7883f8de1e461580047d18709.tar
forums-3d9e57d0cec8f6d7883f8de1e461580047d18709.tar.gz
forums-3d9e57d0cec8f6d7883f8de1e461580047d18709.tar.bz2
forums-3d9e57d0cec8f6d7883f8de1e461580047d18709.tar.xz
forums-3d9e57d0cec8f6d7883f8de1e461580047d18709.zip
Merge pull request #1558 from nickvergessen/ticket/11696
[ticket/11696] Rename db_tools.php so it can be autoloaded
Diffstat (limited to 'phpBB/includes/captcha/plugins')
-rw-r--r--phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php12
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);