From: jocuri%softhome.net <>
Date: Fri, 3 Dec 2004 06:31:50 +0000 (+0000)
Subject: Patch for bug 262141: Enable the creation of bookmarkable URL for bug entry when... 
X-Git-Tag: bugzilla-2.18~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cfdaa590ba7012e19b431fcfc79b11b7aa79fae;p=thirdparty%2Fbugzilla.git

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.
---

diff --git a/post_bug.cgi b/post_bug.cgi
index 800b46f016..473a1563a2 100755
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -75,10 +75,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'};
@@ -121,6 +117,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://';