From df68ce58cf5480656e723858d933c7f302226b26 Mon Sep 17 00:00:00 2001
From: Matthew Wilson <matt@plainblack.com>
Date: Fri, 13 May 2005 13:57:21 +0000
Subject: [PATCH]  - fix [ 1200874 ] "reply with quote" in WebGUI Help

---
 lib/WebGUI/Asset/Post.pm              | 37 +++++++++++----------------
 lib/WebGUI/i18n/English/Asset_Post.pm |  6 ++---
 2 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 44b735db3..1726cc7f8 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -383,34 +383,27 @@ sub getTemplateVars {
 	$var{"userId"} = $self->get("ownerUserId");
 	$var{"user.isPoster"} = $self->isPoster;
 	$var{"userProfile.url"} = $self->getUrl("op=viewProfile&uid=".$self->get("ownerUserId"));
-
 	$var{"dateSubmitted.human"} = epochToHuman($self->get("dateSubmitted"));
 	$var{"dateUpdated.human"} = epochToHuman($self->get("dateUpdated"));
-
 	$var{'title.short'} = $self->chopTitle;
 	$var{content} = $self->formatContent if ($self->getThread);
-
-        $var{'user.canEdit'} = $self->canEdit if ($self->getThread);
-        $var{"delete.url"} = $self->getDeleteUrl;
-        $var{"edit.url"} = $self->getEditUrl;
-
+	$var{'user.canEdit'} = $self->canEdit if ($self->getThread);
+	$var{"delete.url"} = $self->getDeleteUrl;
+	$var{"edit.url"} = $self->getEditUrl;
 	$var{"status"} = $self->getStatus;
-        $var{"approve.url"} = $self->getApproveUrl;
-        $var{"deny.url"} = $self->getDenyUrl;
-
+	$var{"approve.url"} = $self->getApproveUrl;
+	$var{"deny.url"} = $self->getDenyUrl;
 	$var{"reply.url"} = $self->getReplyUrl;
-        $var{'reply.withquote.url'} = $self->getReplyUrl(1);
-
-        $var{'url'} = WebGUI::URL::getSiteURL().$self->getUrl.'#'.$self->getId;
-
-        $var{'rating.value'} = $self->get("rating")+0;
-        $var{'rate.url.1'} = $self->getRateUrl(1);
-        $var{'rate.url.2'} = $self->getRateUrl(2);
-        $var{'rate.url.3'} = $self->getRateUrl(3);
-        $var{'rate.url.4'} = $self->getRateUrl(4);
-        $var{'rate.url.5'} = $self->getRateUrl(5);
-        $var{'hasRated'} = $self->hasRated;
-        $var{'isMarkedRead'} = $self->isMarkedRead;
+	$var{'reply.withquote.url'} = $self->getReplyUrl(1);
+	$var{'url'} = WebGUI::URL::getSiteURL().$self->getUrl.'#'.$self->getId;
+	$var{'rating.value'} = $self->get("rating")+0;
+	$var{'rate.url.1'} = $self->getRateUrl(1);
+	$var{'rate.url.2'} = $self->getRateUrl(2);
+	$var{'rate.url.3'} = $self->getRateUrl(3);
+	$var{'rate.url.4'} = $self->getRateUrl(4);
+	$var{'rate.url.5'} = $self->getRateUrl(5);
+	$var{'hasRated'} = $self->hasRated;
+	$var{'isMarkedRead'} = $self->isMarkedRead;
 	my $gotImage;
 	my $gotAttachment;
 	@{$var{'attachment_loop'}} = ();
diff --git a/lib/WebGUI/i18n/English/Asset_Post.pm b/lib/WebGUI/i18n/English/Asset_Post.pm
index 7c88c44b1..5f2a35de5 100644
--- a/lib/WebGUI/i18n/English/Asset_Post.pm
+++ b/lib/WebGUI/i18n/English/Asset_Post.pm
@@ -209,11 +209,11 @@ The URL to deny this Post, if it's moderated.
 <p>
 
 <b>reply.url</b><br>
-The URL to reply to this Post and quote it in your reply.
+The URL to reply to this Post without quoting it.
 <p>
 
-<b>reply.withoutQuote.url</b><br>
-The URL to reply to this Post without quoting it.
+<b>reply.withQuote.url</b><br>
+The URL to initiate a quoted reply to this Post.
 <p>
 
 <b>url</b><br>