1 files changed, 7 insertions, 4 deletions

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://';