From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 22 Jun 2005 20:22:31 +0000 (+0000)
Subject: * (bug 2178) Fix temp dir check again
X-Git-Tag: 1.5.0beta1~87
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=1e3c99396fe85e9a02cc64c53a0e108a11931d53;p=lhc%2Fweb%2Fwiklou.git

* (bug 2178) Fix temp dir check again
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 84702ac582..29204f35eb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -321,6 +321,8 @@ Various bugfixes, small features, and a few experimental things:
   and can be turned back on by setting $wgCopyrightAffirmation to a true value.
 * Restored prior text for password reminder button and e-mail, replacing
   the factually inaccurate text that was there.
+* (bug 2178) Fix temp dir check again
+
 
 === Caveats ===
 
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 6884cff707..9dd3d1e2d5 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1221,7 +1221,7 @@ function &wfGetMimeMagic() {
  */
 function wfTempDir() {
 	foreach( array( 'TMPDIR', 'TMP', 'TEMP' ) as $var ) {
-		$tmp = getenv( 'TMPDIR' );
+		$tmp = getenv( $var );
 		if( $tmp && file_exists( $tmp ) && is_dir( $tmp ) && is_writable( $tmp ) ) {
 			return $tmp;
 		}