Merge branch '3.1.x'

This commit is contained in:
Joas Schilling 2015-04-06 14:22:18 +02:00
commit 478fed7ee1

View file

@ -200,6 +200,15 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
$config_ary, $config_ary,
$error $error
); );
if ($expected === true)
{
$this->assertEmpty($error);
}
else
{
$this->assertEquals(array($expected), $error);
}
} }
public function data_validate_path_windows() public function data_validate_path_windows()