From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 26 May 2012 03:41:06 +0000 (-0700)
Subject: Removed dead code since PHP minimum is > 5.2.1.
X-Git-Tag: 1.31.0-rc.0~23466
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=2dbea5d2788956c172a8a94f5cbb571f7e9acc3b;p=lhc%2Fweb%2Fwiklou.git

Removed dead code since PHP minimum is > 5.2.1.

Change-Id: I565ff44e5e058ce72cd2eaeaec9ea1e441d01010
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index cc93aa45f7..57ab64cf4d 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2625,11 +2625,7 @@ function wfTempDir() {
 			return $tmp;
 		}
 	}
-	if( function_exists( 'sys_get_temp_dir' ) ) {
-		return sys_get_temp_dir();
-	}
-	# Usual defaults
-	return wfIsWindows() ? 'C:\Windows\Temp' : '/tmp';
+	return sys_get_temp_dir();
 }
 
 /**