From e345fd870679924049233a5f95d272f57645412a Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Wed, 28 Jan 2009 18:24:26 +0000 Subject: [PATCH] fixed #9592: DataForm deleteAttachedFiles method can crash --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/DataForm.pm | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 639353201..da2657594 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,6 +1,7 @@ 7.6.11 - fixed: Syndicated Content asset doesn't work with feeds that specify their encodings via HTTP headers - fixed #9375: Syndicated Content asset improperly decodes wide XML entities + - fixed #9592: DataForm deleteAttachedFiles method can crash 7.6.10 - fixed #9577: WebGUI::Form::Url::getValue returns blank rather than undef for blank fields diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index b34423e24..2b4810d59 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -484,7 +484,9 @@ sub deleteAttachedFiles { my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field}); if ($form->can('getStorageLocation')) { my $storage = $form->getStorageLocation; - $storage->delete; + if ($storage) { + $storage->delete; + } } } }