From: Pierre Joye <pajoye@php.net>
Date: Mon, 26 Aug 2002 00:18:00 +0000 (+0000)
Subject: Rule 1: Never quickly fix a thing in cvs
X-Git-Tag: RELEASE_0_91~236
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ea6a5b807857a1a49d4194f9797912269e0460e;p=php

Rule 1: Never quickly fix a thing in cvs
Rule 2: follow rule 1
Thx rasmus :)
---

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';
     }