Permalink
Browse files

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

…der-override-rc

Issue #6667: Use TEMP_FOLDER in install.php
  • Loading branch information...
2 parents e307594 + ecb279c commit ae45ef3bc2cb8b4dd23c91a3055dd00b2524bc7c @halkyon halkyon committed Mar 9, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 dev/install/install.php5
View
@@ -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();

0 comments on commit ae45ef3

Please sign in to comment.