Merge pull request #222 from robert-h-curry/6667-install-use-temp-fol…

…der-override-rc Issue #6667: Use TEMP_FOLDER in install.php
silverstripe · Mar 9, 2012 · ae45ef3 · ae45ef3
2 parents e307594 + ecb279c
commit ae45ef3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/dev/install/install.php5 b/dev/install/install.php5
@@ -670,7 +670,9 @@ class InstallRequirements {
 	}
 
 	function getTempFolder() {
-		if(file_exists($this->getBaseDir() . 'silverstripe-cache')) {
+		if (defined('TEMP_FOLDER')) {
+			$sysTmp = TEMP_FOLDER;
+		} elseif(file_exists($this->getBaseDir() . 'silverstripe-cache')) {
 			$sysTmp = $this->getBaseDir();
 		} elseif(function_exists('sys_get_temp_dir')) {
 			$sysTmp = sys_get_temp_dir();