From fe81b42398131b3dc62c320ddd07789cb5545357 Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net" <>
Date: Fri, 3 Dec 2004 06:31:35 +0000
Subject: Patch for bug 262141: Enable the creation of bookmarkable URL for bug
 entry when param commentoncreate is set; patch by Shane H. W. Travis
 <travis@sedsystems.ca>, r=gerv, a=justdave.

---
 post_bug.cgi | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'post_bug.cgi')

diff --git a/post_bug.cgi b/post_bug.cgi
index 94533e38d..5fc50e66f 100755
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -74,10 +74,6 @@ my $format = GetFormat("bug/create/comment", $::FORM{'format'}, "txt");
 $template->process($format->{'template'}, $vars, \$comment)
   || ThrowTemplateError($template->error());
 
-# Check that if required a description has been provided
-if (Param("commentoncreate") && !trim($::FORM{'comment'})) {
-    ThrowUserError("description_required");
-}
 ValidateComment($comment);
 
 my $product = $::FORM{'product'};
@@ -120,6 +116,13 @@ if (!defined $::FORM{'short_desc'} || trim($::FORM{'short_desc'}) eq "") {
     ThrowUserError("require_summary");
 }
 
+# Check that if required a description has been provided
+# This has to go somewhere after 'maketemplate' 
+#  or it breaks bookmarks with no comments.
+if (Param("commentoncreate") && !trim($::FORM{'comment'})) {
+    ThrowUserError("description_required");
+}
+
 # If bug_file_loc is "http://", the default, strip it out and use an empty
 # value. 
 $::FORM{'bug_file_loc'} = "" if $::FORM{'bug_file_loc'} eq 'http://';
-- 
cgit v1.2.3-24-g4f1b