aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-04-16 17:35:43 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-04-16 17:35:43 +0200
commitc5126af1df58229cfc30eb8cd81c311a307747cd (patch)
treefdfff34c40b96f3981deeeaa24732a4de9ab6ce2
parent1b63292cc3f1d55d81d38c695958a9a1c290a6c5 (diff)
parentf39e5424f1f8585a7ffad9ad068f3ae14fcd2375 (diff)
downloadforums-c5126af1df58229cfc30eb8cd81c311a307747cd.tar
forums-c5126af1df58229cfc30eb8cd81c311a307747cd.tar.gz
forums-c5126af1df58229cfc30eb8cd81c311a307747cd.tar.bz2
forums-c5126af1df58229cfc30eb8cd81c311a307747cd.tar.xz
forums-c5126af1df58229cfc30eb8cd81c311a307747cd.zip
Merge pull request #4795 from marc1706/ticket/14938
[ticket/14938] Add missing language class to extension manager mock
-rw-r--r--tests/mock/extension_manager.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/mock/extension_manager.php b/tests/mock/extension_manager.php
index 4e48278bbd..0d6d110647 100644
--- a/tests/mock/extension_manager.php
+++ b/tests/mock/extension_manager.php
@@ -15,12 +15,15 @@ class phpbb_mock_extension_manager extends \phpbb\extension\manager
{
public function __construct($phpbb_root_path, $extensions = array(), $container = null)
{
+ global $phpEx;
+
+ $lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = 'php';
$this->extensions = $extensions;
$this->filesystem = new \phpbb\filesystem\filesystem();
$this->container = $container;
$this->config = new \phpbb\config\config(array());
- $this->user = new \phpbb\user('\phpbb\datetime');
+ $this->user = new \phpbb\user($lang,'\phpbb\datetime');
}
}