From 414ea3de9e87812c5ac96cc15062307c608e0963 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 9 Nov 2015 16:39:33 +1300
Subject: [PATCH] BUG prevent UploadField edit form generation for Folders

---
 forms/UploadField.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/forms/UploadField.php b/forms/UploadField.php
index 41485b489..57926dc77 100644
--- a/forms/UploadField.php
+++ b/forms/UploadField.php
@@ -1432,6 +1432,10 @@ class UploadField_ItemHandler extends RequestHandler {
 	 */
 	public function EditForm() {
 		$file = $this->getItem();
+		if(!$file) return $this->httpError(404);
+		if($file instanceof Folder) return $this->httpError(403);
+		if(!$file->canEdit()) return $this->httpError(403);
+		
 		// Get form components
 		$fields = $this->parent->getFileEditFields($file);
 		$actions = $this->parent->getFileEditActions($file);