From 5ea6a5b807857a1a49d4194f9797912269e0460e Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Mon, 26 Aug 2002 00:18:00 +0000 Subject: Rule 1: Never quickly fix a thing in cvs Rule 2: follow rule 1 Thx rasmus :) --- pear/System.php | 16 ++++++++-------- 1 file 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'; } -- cgit v1.2.1