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

Merge pull request #4754 from tractorcow/pulls/3.2/upload-fixes

Browse Source 
BUG prevent UploadField edit form generation for Folders
This commit is contained in:
Daniel Hensby 2015-11-09 20:50:57 +00:00
commit c2c78c445e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
forms/UploadField.php
View File

@ -1432,6 +1432,10 @@ class UploadField_ItemHandler extends RequestHandler {
*/ */
public function EditForm() { public function EditForm() {
$file = $this->getItem(); $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 // Get form components
$fields = $this->parent->getFileEditFields($file); $fields = $this->parent->getFileEditFields($file);
$actions = $this->parent->getFileEditActions($file); $actions = $this->parent->getFileEditActions($file);