From afd8faf56726f382b93c02fc7ee4bb88b19b1991 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 13 Apr 2010 06:59:09 +0000 Subject: [PATCH] BUGFIX #4857 Fixed potential bug where a file would just be uploaded to a random folder, also files can now be uploaded to the assets root properly (from r96993) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102705 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/AssetAdmin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index 81491d49..c7a792dc 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -156,10 +156,10 @@ JS } // get the folder to upload to. - if(isset($data['FolderID']) && $data['FolderID'] != "root") { + if(isset($data['FolderID']) && $data['FolderID'] && $data['FolderID'] != "root") { $folder = DataObject::get_by_id('Folder', $data['FolderID']); } else { - $folder = DataObject::get_one('Folder'); + $folder = singleton('Folder'); } foreach($processedFiles as $tmpFile) {