Permalink
Browse files

BUGFIX Supress mkdir() when attempting to create a temp folder, instead

of the variable. This gives a nicer error in the installer.
  • Loading branch information...
1 parent 04e5ff0 commit 105986392bc51f46f7c2b50103f31fed0592bace @halkyon halkyon committed Jun 14, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 core/Core.php
  2. +2 −2 dev/install/install.php5
View
@@ -324,14 +324,14 @@ function getTempFolder($base = null) {
$ssTmp = "$sysTmp/$cachefolder";
if(!@file_exists($ssTmp)) {
- @$worked = mkdir($ssTmp);
+ $worked = @mkdir($ssTmp);
}
if(!$worked) {
$ssTmp = BASE_PATH . "/silverstripe-cache";
$worked = true;
if(!@file_exists($ssTmp)) {
- @$worked = mkdir($ssTmp);
+ $worked = @mkdir($ssTmp);
}
}
View
@@ -725,14 +725,14 @@ class InstallRequirements {
$ssTmp = "$sysTmp/silverstripe-cache";
if(!@file_exists($ssTmp)) {
- @$worked = mkdir($ssTmp);
+ $worked = @mkdir($ssTmp);
}
if(!$worked) {
$ssTmp = dirname($_SERVER['SCRIPT_FILENAME']) . '/silverstripe-cache';
$worked = true;
if(!@file_exists($ssTmp)) {
- @$worked = mkdir($ssTmp);
+ $worked = @mkdir($ssTmp);
}
}

0 comments on commit 1059863

Please sign in to comment.