From bbdd54cf89b632aabe7d385a38f9a633eeeb074b Mon Sep 17 00:00:00 2001 From: Andy Grundman Date: Tue, 17 Jun 2003 18:57:35 +0000 Subject: [PATCH] Fixed bug where collateral files were not deleted from disk, and where types != image were not removed from database --- lib/WebGUI/Collateral.pm | 2 +- lib/WebGUI/CollateralFolder.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/WebGUI/Collateral.pm b/lib/WebGUI/Collateral.pm index f7ecc9633..5bebf9707 100644 --- a/lib/WebGUI/Collateral.pm +++ b/lib/WebGUI/Collateral.pm @@ -221,7 +221,7 @@ Returns a list of WebGUI::Collateral objects. sub multiNew { my ($class,@collateralIds) = @_; - return () unless @collaterlIds; + return () unless @collateralIds; my (@objs); diff --git a/lib/WebGUI/CollateralFolder.pm b/lib/WebGUI/CollateralFolder.pm index 1966a879a..ff241b62a 100644 --- a/lib/WebGUI/CollateralFolder.pm +++ b/lib/WebGUI/CollateralFolder.pm @@ -70,7 +70,7 @@ sub recursiveDelete { # need the following line: # WebGUI::Collateral->multiDelete(collateralFolderId => \@ids); - my @collateralIds = WebGUI::SQL->buildArray("select collateralId from collateral where collateralType='image' and collateralFolderId in (".join(',',@ids).")"); + my @collateralIds = WebGUI::SQL->buildArray("select collateralId from collateral where collateralFolderId in (".join(',',@ids).")"); WebGUI::Collateral->multiDelete(@collateralIds); }