* (bug 2178) Fix temp dir check again

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 84702ac..29204f3 100644 (file)
--- 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 6884cff..9dd3d1e 100644 (file)
--- 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;
                }