aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework/phpbb_test_case_helpers.php
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test_framework/phpbb_test_case_helpers.php')
-rw-r--r--tests/test_framework/phpbb_test_case_helpers.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 51b04db263..4aec07a8fb 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -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;