From 88cbd4605e42dcfb9b4b3a52dd63d5544309c0d2 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 29 Aug 2011 08:59:58 +0200
Subject: [PATCH] MINOR Better error checking in AssetAdmin->doUpload()
 (AIR-41)

---
 code/AssetAdmin.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php
index 4e16d404..9b23d3d8 100755
--- a/code/AssetAdmin.php
+++ b/code/AssetAdmin.php
@@ -209,8 +209,12 @@ JS
 		}
 		$processedData = array_reverse($processedData);
 				
-		if($data['FolderID'] && $data['FolderID'] != '') $folder = DataObject::get_by_id("Folder", $data['FolderID']);
-		else $folder = singleton('Folder');
+		if($data['FolderID'] && $data['FolderID'] != '') {
+			$folder = DataObject::get_by_id("Folder", $data['FolderID']);
+			if(!$folder) throw new InvalidArgumentException(sprintf("Folder #%d doesn't exist", (int)$data['FolderID']));
+		} else {
+			$folder = singleton('Folder');
+		}
 
 		foreach($processedFiles as $filePostId => $tmpFile) {
 			if($tmpFile['error'] == UPLOAD_ERR_NO_TMP_DIR) {