From 8fb74410ab5848bf32d841a5e03b75f1b7e65624 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sun, 16 Apr 2006 18:04:28 +0000
Subject: [PATCH] a few bug fixes

---
 docs/upgrades/upgrade_6.8.8-6.99.0.pl | 1 +
 lib/WebGUI/Asset/Wobject/Article.pm   | 3 ++-
 lib/WebGUI/Asset/Wobject/DataForm.pm  | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/upgrades/upgrade_6.8.8-6.99.0.pl b/docs/upgrades/upgrade_6.8.8-6.99.0.pl
index 088921550..245e318b3 100644
--- a/docs/upgrades/upgrade_6.8.8-6.99.0.pl
+++ b/docs/upgrades/upgrade_6.8.8-6.99.0.pl
@@ -70,6 +70,7 @@ sub updateArticle {
 				}
 				foreach my $child (@{$children}) {
 					$child->getStorageLocation->copy($storage);
+					$child->purge;
 				}
 			}
 		}
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index acabab91d..710536856 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -288,6 +288,7 @@ sub view {
 	my %var;
 	if ($self->get("storageId")) {
 		my $storage = $self->getStorageLocation; 
+		my @loop = ();
 		foreach my $file (@{$storage->getFiles}) {
 			if ($storage->isImage($file)) {
 				$var{'image.url'} = $storage->getUrl($file);
@@ -308,7 +309,7 @@ sub view {
 	}
         $var{description} = $self->get("description");
 	if ($self->get("convertCarriageReturns")) {
-		$var{description} =~ s/\n/\<br\>\n/g;
+		$var{description} =~ s/\n/\<br \/\>\n/g;
 	}
 	$var{"new.template"} = $self->getUrl.";overrideTemplateId=";
 	$var{"description.full"} = $var{description};
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index c2938cac7..422eb43c9 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -516,7 +516,6 @@ sub getRecordTemplateVars {
 }
 
 
-
 #-------------------------------------------------------------------
 
 =head2 prepareView ( )