1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 01:36:57 +02:00

[ticket/10586] more work on getting tests to pass

PHPBB3-10586
This commit is contained in:
David King
2012-03-18 14:44:37 -04:00
parent 4100b312bb
commit 7d1e4bca33
3 changed files with 9 additions and 17 deletions

View File

@@ -81,7 +81,7 @@ class phpbb_test_case_helpers
$config['phpbb_functional_url'] = $phpbb_functional_url;
}
if (isset($phpbb_functional_path))
if (!empty($phpbb_functional_path))
{
$config['phpbb_functional_path'] = $phpbb_functional_path;
}
@@ -106,11 +106,9 @@ class phpbb_test_case_helpers
));
}
if (isset($_SERVER['PHPBB_FUNCTIONAL_PATH']))
if (!empty($_SERVER['PHPBB_FUNCTIONAL_PATH']))
{
$config = array_merge($config, array(
'phpbb_functional_path' => isset($_SERVER['PHPBB_FUNCTIONAL_PATH']) ? $_SERVER['PHPBB_FUNCTIONAL_PATH'] : '',
));
$config['phpbb_functional_path'] = $_SERVER['PHPBB_FUNCTIONAL_PATH'];
}
return $config;