Fix another DataForm deletion bug, deleting when there's no storage object.
This commit is contained in:
parent
a9a49d3205
commit
a8979545ef
2 changed files with 4 additions and 5 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
7.6.14
|
7.6.14
|
||||||
- fixed: IE6 shows Admin Bar over Asset Manager
|
- fixed: IE6 shows Admin Bar over Asset Manager
|
||||||
- fixed: #9808: Search i18n
|
- fixed #9808: Search i18n
|
||||||
|
- fixed #9818: deleteAttachedFiles bug (THE REVENGE)
|
||||||
|
|
||||||
7.6.13
|
7.6.13
|
||||||
- fixed AdSpace bug: impressions and clicks for most non-human web clients will not be counted.
|
- fixed AdSpace bug: impressions and clicks for most non-human web clients will not be counted.
|
||||||
|
|
|
||||||
|
|
@ -484,9 +484,7 @@ sub deleteAttachedFiles {
|
||||||
my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
|
my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
|
||||||
if ($form->can('getStorageLocation')) {
|
if ($form->can('getStorageLocation')) {
|
||||||
my $storage = $form->getStorageLocation;
|
my $storage = $form->getStorageLocation;
|
||||||
if ($storage) {
|
$storage->delete if $storage;
|
||||||
$storage->delete;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -498,7 +496,7 @@ sub deleteAttachedFiles {
|
||||||
my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
|
my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
|
||||||
if ($form->can('getStorageLocation')) {
|
if ($form->can('getStorageLocation')) {
|
||||||
my $storage = $form->getStorageLocation;
|
my $storage = $form->getStorageLocation;
|
||||||
$storage->delete;
|
$storage->delete if $storage;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue