From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 7 May 2007 05:25:28 +0000 (-0700)
Subject:   - Fix package link code and link both packages (closes: #419553)
X-Git-Tag: release/2.6.0~565^2~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aa3f8e65c210542903b7bf23d147deeb38df3d41;p=debbugs.git

  - Fix package link code and link both packages (closes: #419553)
---

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 4987816..b001d91 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -431,7 +431,7 @@ sub handle_record{
 		      {(defined $2?$1.bug_links($2):'').$3.
 			    join(' ',map {bug_links($_)} (split /\,?\s+/, $4))}eo;
 	  # Add links to reassigned packages
-	  $output =~ s{(Bug reassigned from package \`)([^\']+)(' to \`)([^\']+)(')}
+	  $output =~ s{(Bug reassigned from package \`)([^']+)((?:'|\&\#39;) to \`)([^']+)((?:'|\&\#39;))}
 	  {$1.q(<a href=").pkg_url(pkg=>$2).qq(">$2</a>).$3.q(<a href=").pkg_url(pkg=>$4).qq(">$4</a>).$5}eo;
 	  if (defined $time) {
 	       $output .= ' ('.strftime('%a, %d %b %Y %T GMT',gmtime($time)).') ';
diff --git a/debian/changelog b/debian/changelog
index 4f0e3b5..87bb5b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -169,6 +169,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Add quotes around retitle'd titles (closes: #419202)
     - Make file locking portable (closes: #293277)
     - Allow the package pages to be optional (closes: #234362)
+    - Fix package link code and link both packages (closes: #419553)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100