tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX Making path names consistent

Browse Source 
I've changed the variables to use the absolute path as the path is unhelpful for debugging and this is more consistent with the other lines of code below
This commit is contained in:
Daniel Hensby 2013-05-28 19:08:59 +02:00
parent 80bcf5e713
commit 295f76e331
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
filesystem/File.php
View File

@ -527,13 +527,13 @@ class File extends DataObject {
if(!is_a($this, 'Folder')) { if(!is_a($this, 'Folder')) {
// Only throw a fatal error if *both* before and after paths don't exist. // Only throw a fatal error if *both* before and after paths don't exist.
if(!file_exists($pathBeforeAbs)) { if(!file_exists($pathBeforeAbs)) {
throw new Exception("Cannot move $pathBefore to $pathAfter - $pathBefore doesn't exist"); throw new Exception("Cannot move $pathBeforeAbs to $pathAfterAbs - $pathBeforeAbs doesn't exist");
} }
// Check that target directory (not the file itself) exists. // Check that target directory (not the file itself) exists.
// Only check if we're dealing with a file, otherwise the folder will need to be created // Only check if we're dealing with a file, otherwise the folder will need to be created
if(!file_exists(dirname($pathAfterAbs))) { if(!file_exists(dirname($pathAfterAbs))) {
throw new Exception("Cannot move $pathBefore to $pathAfter - Directory " . dirname($pathAfter) throw new Exception("Cannot move $pathBeforeAbs to $pathAfterAbs - Directory " . dirname($pathAfter)
. " doesn't exist"); . " doesn't exist");
} }
} }