summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2005-07-26 23:36:13 +0200
committerlpsolit%gmail.com <>2005-07-26 23:36:13 +0200
commitb9f1149d089594e3135a6b169ff6eef4ef4be52d (patch)
treec23e8abda515a363950d7decfb199e326f58fe64
parent3e48dcd06407ccb38d739740b3374c48a809067d (diff)
downloadbugzilla-b9f1149d089594e3135a6b169ff6eef4ef4be52d.tar.gz
bugzilla-b9f1149d089594e3135a6b169ff6eef4ef4be52d.tar.xz
Bug 298273: Marking duplicates misses 'Bug' before the number - Patch by Marc Schumann <wurblzap@gmail.com> r=LpSolit a=justdave
-rw-r--r--globals.pl2
-rwxr-xr-xprocess_bug.cgi2
2 files changed, 2 insertions, 2 deletions
diff --git a/globals.pl b/globals.pl
index 780e85e0b..f8f070366 100644
--- 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 c8e1e8114..50fde12eb 100755
--- 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;
};