diff options
author | Pierre Joye <pajoye@php.net> | 2002-08-26 00:18:00 +0000 |
---|---|---|
committer | Pierre Joye <pajoye@php.net> | 2002-08-26 00:18:00 +0000 |
commit | 5ea6a5b807857a1a49d4194f9797912269e0460e (patch) | |
tree | 880cf01e4667e0b64d58d0574e6f491d85eaa73c | |
parent | 1ce75e3a638bae7457a1b5253904c6dd2854c62f (diff) | |
download | php-git-5ea6a5b807857a1a49d4194f9797912269e0460e.tar.gz |
Rule 1: Never quickly fix a thing in cvs
Rule 2: follow rule 1
Thx rasmus :)
-rw-r--r-- | pear/System.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pear/System.php b/pear/System.php index c3d068b9d6..e2c35e6068 100644 --- a/pear/System.php +++ b/pear/System.php @@ -391,19 +391,19 @@ class System function tmpdir() { if (OS_WINDOWS) { - if (getenv('TEMP')) { - return getenv('TEMP'); + if (($var=$_ENV['TEMP']) || $var=getenv('TEMP')) { + return $var; } - if (getenv('TMP')) { - return getenv('TMP'); + if (($var=$_ENV['TMP']) || $var=getenv('TMP')) { + return $var; } - if (getenv('windir')) { - return getenv('windir') . '\temp'; + if (($var=$_ENV['windir']) || $var=getenv('windir')) { + return $var; } return getenv('SystemRoot') . '\temp'; } - if (getenv('TMPDIR')) { - return getenv('TMPDIR'); + if (($var=$_ENV['TMPDIR']) || $var=getenv('TMPDIR')) { + return $var; } return '/tmp'; } |