diff --git a/phpBB/phpbb/console/command/searchindex/create.php b/phpBB/phpbb/console/command/searchindex/create.php
index 6652e38159..ce282e94f8 100644
--- a/phpBB/phpbb/console/command/searchindex/create.php
+++ b/phpBB/phpbb/console/command/searchindex/create.php
@@ -13,7 +13,6 @@
namespace phpbb\console\command\searchindex;
-use phpbb\config\config;
use phpbb\console\command\command;
use phpbb\language\language;
use phpbb\log\log;
@@ -29,9 +28,6 @@ use Symfony\Component\Console\Style\SymfonyStyle;
class create extends command
{
- /** @var config */
- protected $config;
-
/** @var language */
protected $language;
@@ -50,7 +46,6 @@ class create extends command
/**
* Construct method
*
- * @param config $config
* @param language $language
* @param log $log
* @param post_helper $post_helper
@@ -58,9 +53,8 @@ class create extends command
* @param state_helper $state_helper
* @param user $user
*/
- public function __construct(config $config, language $language, log $log, post_helper $post_helper, search_backend_factory $search_backend_factory, state_helper $state_helper, user $user)
+ public function __construct(language $language, log $log, post_helper $post_helper, search_backend_factory $search_backend_factory, state_helper $state_helper, user $user)
{
- $this->config = $config;
$this->language = $language;
$this->log = $log;
$this->post_helper = $post_helper;
diff --git a/phpBB/phpbb/console/command/searchindex/delete.php b/phpBB/phpbb/console/command/searchindex/delete.php
index 618bdce03d..5fe2514eea 100644
--- a/phpBB/phpbb/console/command/searchindex/delete.php
+++ b/phpBB/phpbb/console/command/searchindex/delete.php
@@ -13,7 +13,6 @@
namespace phpbb\console\command\searchindex;
-use phpbb\config\config;
use phpbb\console\command\command;
use phpbb\language\language;
use phpbb\log\log;
@@ -29,9 +28,6 @@ use Symfony\Component\Console\Style\SymfonyStyle;
class delete extends command
{
- /** @var config */
- protected $config;
-
/** @var language */
protected $language;
@@ -50,7 +46,6 @@ class delete extends command
/**
* Construct method
*
- * @param config $config
* @param language $language
* @param log $log
* @param post_helper $post_helper
@@ -58,9 +53,8 @@ class delete extends command
* @param state_helper $state_helper
* @param user $user
*/
- public function __construct(config $config, language $language, log $log, post_helper $post_helper, search_backend_factory $search_backend_factory, state_helper $state_helper, user $user)
+ public function __construct(language $language, log $log, post_helper $post_helper, search_backend_factory $search_backend_factory, state_helper $state_helper, user $user)
{
- $this->config = $config;
$this->language = $language;
$this->log = $log;
$this->post_helper = $post_helper;
diff --git a/phpBB/phpbb/console/command/searchindex/list_all.php b/phpBB/phpbb/console/command/searchindex/list_all.php
index cfa26e7893..cf22b8e538 100644
--- a/phpBB/phpbb/console/command/searchindex/list_all.php
+++ b/phpBB/phpbb/console/command/searchindex/list_all.php
@@ -81,7 +81,7 @@ class list_all extends command
foreach ($this->search_backend_collection as $search_backend)
{
$name = $search_backend->get_type();
- $active = ($name === $this->config['search_type']) ? '(' . $this->language->lang('ACTIVE') . ') ' : '';
+ $active = ($name === $this->config['search_type']) ? '(' . $this->language->lang('$') . ') ' : '';
$search_backends[] = '' . $name . ' ' . $active . $search_backend->get_name();
if ($name === $this->config['search_type'] && !$search_backend->index_created())
diff --git a/tests/console/searchindex/create_test.php b/tests/console/searchindex/create_test.php
index 43178e8408..fef0117e7b 100644
--- a/tests/console/searchindex/create_test.php
+++ b/tests/console/searchindex/create_test.php
@@ -14,7 +14,6 @@ class create_test extends base
{
$application = new Application();
$application->add(new create(
- $this->config,
$this->language,
$this->log,
$this->post_helper,
diff --git a/tests/console/searchindex/delete_test.php b/tests/console/searchindex/delete_test.php
index 2e17a99e48..953fe556fc 100644
--- a/tests/console/searchindex/delete_test.php
+++ b/tests/console/searchindex/delete_test.php
@@ -14,7 +14,6 @@ class delete_test extends base
{
$application = new Application();
$application->add(new delete(
- $this->config,
$this->language,
$this->log,
$this->post_helper,