From 37ae99c75d388221489aa1069078d92eca413741 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 24 Jan 2015 12:06:45 +0100
Subject: [ticket/10748] Replace direct creations of tools();

PHPBB3-10748
---
 phpBB/phpbb/captcha/plugins/qa.php     | 12 +++++-------
 phpBB/phpbb/search/fulltext_sphinx.php |  3 ++-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php
index b4586f1234..cf03f92e96 100644
--- a/phpBB/phpbb/captcha/plugins/qa.php
+++ b/phpBB/phpbb/captcha/plugins/qa.php
@@ -113,9 +113,9 @@ class qa
 	*/
 	public function is_installed()
 	{
-		global $db;
+		global $phpbb_container;
 
-		$db_tool = new \phpbb\db\tools\tools($db);
+		$db_tool = $phpbb_container->get('dbal.tools');
 
 		return $db_tool->sql_table_exists($this->table_captcha_questions);
 	}
@@ -306,11 +306,9 @@ class qa
 	*/
 	function install()
 	{
-		global $db;
-
-		$db_tool = new \phpbb\db\tools\tools($db);
+		global $phpbb_container;
 
-		$tables = array($this->table_captcha_questions, $this->table_captcha_answers, $this->table_qa_confirm);
+		$db_tool = $phpbb_container->get('dbal.tools');
 
 		$schemas = array(
 				$this->table_captcha_questions		=> array (
@@ -352,7 +350,7 @@ class qa
 				),
 		);
 
-		foreach($schemas as $table => $schema)
+		foreach ($schemas as $table => $schema)
 		{
 			if (!$db_tool->sql_table_exists($table))
 			{
diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php
index 0be646ff06..a5ad96b114 100644
--- a/phpBB/phpbb/search/fulltext_sphinx.php
+++ b/phpBB/phpbb/search/fulltext_sphinx.php
@@ -136,7 +136,8 @@ class fulltext_sphinx
 		$this->auth = $auth;
 
 		// Initialize \phpbb\db\tools\tools object
-		$this->db_tools = new \phpbb\db\tools\tools($this->db);
+		global $phpbb_container; // TODO inject into object
+		$this->db_tools = $phpbb_container->get('dbal.tools');
 
 		if(!$this->config['fulltext_sphinx_id'])
 		{
-- 
cgit v1.2.1