Upload path regression caused by 3d24079

silverstripe · Feb 19, 2014 · caecc05 · caecc05
1 parent 6ba7b2e
commit caecc05
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/filesystem/Upload.php b/filesystem/Upload.php
@@ -134,7 +134,7 @@ public function load($tmpFile, $folderPath = false) {
 		$file = $nameFilter->filter($tmpFile['name']);
 		$fileName = basename($file);
 
-		$relativeFilePath = $parentFolder->getRelativePath() . "/$fileName";
+		$relativeFilePath = $parentFolder ? $parentFolder->getRelativePath() . "$fileName" : $fileName;		
 
 		// Create a new file record (or try to retrieve an existing one)
 		if(!$this->file) {