Bug 298273: Marking duplicates misses 'Bug' before the number - Patch by Marc Schuman...

diff --git a/globals.pl b/globals.pl
index 780e85e0bcd9dea75a891d2c39765352a9dca416..f8f070366117816b5e230b92c66b6f992d24ee85 100644 (file)
--- a/globals.pl
+++ b/globals.pl
@@ -825,7 +825,7 @@ sub quoteUrls {
                               "<a href=\"#c$4\">$1</a>")
               ~egox;
 
-    # Duplicate markers
+    # Old duplicate markers
     $text =~ s~(?<=^\*\*\*\ This\ bug\ has\ been\ marked\ as\ a\ duplicate\ of\ )
                (\d+)
                (?=\ \*\*\*\Z)

diff --git a/process_bug.cgi b/process_bug.cgi
index c8e1e81149e53db1c73fdb72140d71ffdee1a8c6..50fde12eb58c02e00c4a1c787bbdc8a185f049ce 100755 (executable)
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -1044,7 +1044,7 @@ SWITCH: for ($cgi->param('knob')) {
         ChangeResolution('DUPLICATE');
         my $comment = $cgi->param('comment');
         $comment .= "\n\n*** This bug has been marked " .
-                    "as a duplicate of $duplicate ***";
+                    "as a duplicate of bug $duplicate ***";
         $cgi->param('comment', $comment);
         last SWITCH;
     };