From 3fd57a3559c8c75a8c82b76975e1d1f4b19bc926 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Tue, 17 Jan 2006 05:36:56 +0000 Subject: [PATCH] more session related bug fixes --- lib/WebGUI/AssetTrash.pm | 2 +- t/Asset/Template.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm index b74c06881..b287b1024 100644 --- a/lib/WebGUI/AssetTrash.pm +++ b/lib/WebGUI/AssetTrash.pm @@ -98,7 +98,7 @@ sub purge { my $self = shift; return undef if ($self->getId eq $self->session->setting->get("defaultPage") || $self->getId eq $self->session->setting->get("notFoundPage")); $self->session->db->beginTransaction; - foreach my $definition (@{$self->definition}) { + foreach my $definition (@{$self->definition($self->session)}) { $self->session->db->write("delete from ".$definition->{tableName}." where assetId=".$self->session->db->quote($self->getId)); } $self->session->db->write("delete from metaData_values where assetId = ".$self->session->db->quote($self->getId)); diff --git a/t/Asset/Template.t b/t/Asset/Template.t index 202462e31..3d7cb31b1 100644 --- a/t/Asset/Template.t +++ b/t/Asset/Template.t @@ -36,7 +36,7 @@ $output = $template->process(\%var); ok($output =~ m/AAAAA/, "process() - variables"); ok($output =~ m/true/, "process() - conditionals"); ok($output =~ m/XYXYXYXYXY/, "process() - loops"); - +$template->purge; cleanup($session); # this line is required