From d95ba6c8da6ca1e01376c4c144299921904b4e4f Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 26 Jul 2008 02:28:56 +0000
Subject: [PATCH] Fix two issues with sub deleteAttachedFiles that were
 preventing it from being purged from the trash.

---
 docs/changelog/7.x.x.txt             | 1 +
 lib/WebGUI/Asset/Wobject/DataForm.pm | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 078ae18d8..5a8a310ee 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.5.19
+ - fixed: unable to purge trash
 
 7.5.18
  - fixed: Collateral Image Manager broken in Firefox 3
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 9ebbd4188..3d2ebc219 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -462,10 +462,9 @@ sub deleteAttachedFiles {
     }
     else {
         my $entries = $self->session->db->buildArrayRef("select entryData from DataForm_entry where assetId=?", [$self->getId]);
-        foreach my $entry (@$entries) {
-            my $entryData = decode_json($entry->{entryData});
-            $self->deleteEntryFiles($entryData);
-            for my $field ( @$fields ) {
+        foreach my $entry (@{ $entries}) {
+            my $entryData = decode_json($entry);
+            for my $field (@{ $fields }) {
                 my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
                 if ($form->can('getStorageLocation')) {
                     my $storage = $form->getStorageLocation;