From 20e79f33bec2d0475f934d73ce3493cda3f576cd Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Mon, 29 Oct 2007 01:35:33 +0000 Subject: [PATCH] #1523 - Error when attaching files to pages without having specified a file git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43922 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/Image.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/model/Image.php b/core/model/Image.php index 7d70fa3d0..fc129f49a 100755 --- a/core/model/Image.php +++ b/core/model/Image.php @@ -623,10 +623,21 @@ class Image_Uploader extends Controller { * Save the data in this form. */ function save($data, $form) { + if($data['Upload']['size'] == 0) { + // No image has been uploaded + Director::redirectBack(); + return; + } $owner = DataObject::get_by_id($data['Class'], $data['ID']); $fieldName = $data['Field'] . 'ID'; if($data['ImageSource'] == 'existing') { + if(!$data['ExistingFile']) { + // No image has been selected + Director::redirectBack(); + return; + } + $owner->$fieldName = $data['ExistingFile']; // Edit the class name, if applicable