- Use getenv, as $_ENV is not available when variables_order= in php.ini

does not include "E".
This commit is contained in:
Derick Rethans 2002-10-08 08:39:10 +00:00
parent 6d80a07ba0
commit ede9bd58b7

View File

@ -63,14 +63,14 @@ SAFE_MODE_WARNING;
// Require the explicit specification.
// Otherwise we could end up testing the wrong file!
if (isset($_ENV['TEST_PHP_EXECUTABLE'])) {
$php = $_ENV['TEST_PHP_EXECUTABLE'];
if (getenv('TEST_PHP_EXECUTABLE')) {
$php = getenv('TEST_PHP_EXECUTABLE');
} else {
error("environment variable TEST_PHP_EXECUTABLE must be set to specify PHP executable!");
}
if (isset($_ENV['TEST_PHP_LOG_FORMAT'])) {
$log_format = strtoupper($_ENV['TEST_PHP_LOG_FORMAT']);
if (getenv('TEST_PHP_LOG_FORMAT')) {
$log_format = strtoupper(getenv('TEST_PHP_LOG_FORMAT'));
} else {
$log_format = 'LEOD';
}
@ -81,8 +81,8 @@ if (function_exists('is_executable') && !@is_executable($php)) {
// Check whether a detailed log is wanted.
if (isset($_ENV['TEST_PHP_DETAILED'])) {
define('DETAILED', $_ENV['TEST_PHP_DETAILED']);
if (getenv('TEST_PHP_DETAILED')) {
define('DETAILED', getenv('TEST_PHP_DETAILED'));
} else {
define('DETAILED', 0);
}