From 2bfecac2b9d6278e77d1689a1c8b62507af0bb9a Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 8 Mar 2004 02:40:02 +0000
Subject: [PATCH] fixed a couple of uss formatting bugs

---
 docs/changelog/6.x.x.txt  | 6 ++++++
 lib/WebGUI/Wobject/USS.pm | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index a6da8766f..fbaa5ed95 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,3 +1,9 @@
+6.0.1
+
+ - Fixed a couple of formatting problems with the USS.
+
+
+
 6.0.0
 
  - HTTP header conforming P3P Compact Privacy Policy. This fixes IE6 cookie
diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm
index e2681fd88..8b6c3b0e3 100644
--- a/lib/WebGUI/Wobject/USS.pm
+++ b/lib/WebGUI/Wobject/USS.pm
@@ -679,9 +679,9 @@ sub www_view {
 	$i = 0;
 	my $imageURL;
 	foreach $row (@$page) {
+                $page->[$i]->{content} =~ s/\n/\^\-\;/ unless ($page->[$i]->{content} =~ m/\^\-\;/);
 		$page->[$i]->{content} = WebGUI::HTML::filter($page->[$i]->{content},$_[0]->get("filterContent"));
 		$page->[$i]->{content} = WebGUI::HTML::format($page->[$i]->{content},$page->[$i]->{contentType});
-                $page->[$i]->{content} =~ s/\n/\^\-\;/ unless ($page->[$i]->{content} =~ m/\^\-\;/);
                 @content = split(/\^\-\;/,$page->[$i]->{content});
                 if ($page->[$i]->{image} ne "") {
                         $image = WebGUI::Attachment->new($page->[$i]->{image},$_[0]->get("wobjectId"),$page->[$i]->{USS_submissionId});
@@ -824,7 +824,7 @@ sub www_viewSubmission {
 	$var{title} = $submission->{title};
 	$var{content} = WebGUI::HTML::filter($submission->{content},$_[0]->get("filterContent"));
 	$var{content} =~ s/\^\-\;//g;
-	$var{content} =~ WebGUI::HTML::format($submission->{content},$submission->{contentType});
+	$var{content} = WebGUI::HTML::format($var{content},$submission->{contentType});
         $var{"user.label"} = WebGUI::International::get(21,$_[0]->get("namespace"));
 	$var{"user.Profile"} = WebGUI::URL::page('op=viewProfile&uid='.$submission->{userId});
 	$var{"user.Id"} = $submission->{userId};