mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-01-09 20:34:59 +01:00
parent 996e263cc2 1b7c42bf53
commit d50d878e7b
21 changed files with 110 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -709,7 +709,7 @@ class phpbb_functional_test_case extends phpbb_test_case
protected function remove_user_group($group_name, $usernames)
{
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx;
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $user, $phpbb_root_path, $phpEx;
$config = new \phpbb\config\config(array());
$config['coppa_enable'] = 0;
@@ -746,7 +746,7 @@ class phpbb_functional_test_case extends phpbb_test_case
protected function add_user_group($group_name, $usernames, $default = false, $leader = false)
{
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $phpbb_root_path, $phpEx;
global $db, $cache, $auth, $config, $phpbb_dispatcher, $phpbb_log, $phpbb_container, $user, $phpbb_root_path, $phpEx;
$config = new \phpbb\config\config(array());
$config['coppa_enable'] = 0;
@@ -868,6 +868,8 @@ class phpbb_functional_test_case extends phpbb_test_case
{
$this->add_lang($file);
}
return;
}
$lang_path = __DIR__ . "/../../phpBB/language/en/$lang_file.php";