mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove $_ENV usages, this causes problems with recommanded php.ini files

Browse Source 
Replace by getenv()
This commit is contained in:
Pierre Joye 2002-08-25 18:11:24 +00:00
parent 8638bb882f
commit 9870f455ff
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pear/System.php
View File

@ -391,27 +391,29 @@ class System
function tmpdir()
{
if (OS_WINDOWS) {
if (System::_myenv('TEMP')) {
return System::_myenv('TEMP');
if (getenv('TEMP')) {
return getenv('TEMP');
}
if (System::_myenv('TMP')) {
return System::_myenv('TMP');
if (getenv('TMP')) {
return getenv('TMP');
}
if (System::_myenv('windir')) {
return System::_myenv('windir') . '\temp';
if (getenv('windir')) {
return getenv('windir') . '\temp';
}
return System::_myenv('SystemRoot') . '\temp';
return getenv('SystemRoot') . '\temp';
}
if (System::_myenv('TMPDIR')) {
return System::_myenv('TMPDIR');
if (getenv('TMPDIR')) {
return getenv('TMPDIR');
}
return '/tmp';
}
/**
* (pajoye) Removed, problem with php.ini-recommanded, E removed
*
* (cox) I always get $_ENV empty in both Windows and Linux
* with all PHP version <= 4.2.1
*/
function _myenv($var)
{
if (!empty($_ENV)) {
@ -419,6 +421,7 @@ class System
}
return getenv($var);
}
*/
/**
* The "type" command (show the full path of a command)