From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 28 Jul 2009 15:03:46 +0000 (-0700)
Subject: Handle &#39; ending links in Debbugs::CGI::Bugreport (closes: #539020)
X-Git-Tag: release/2.6.0~456^2~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b624d9d6a6c6c277ab10ab564986986a33e6b4e9;p=debbugs.git

Handle &#39; ending links in Debbugs::CGI::Bugreport (closes: #539020)
---

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index 57f8d8f..6986fbf 100644
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -319,7 +319,7 @@ sub handle_record{
 	  $output .= decode_rfc1522($record->{text});
 	  # Link to forwarded http:// urls in the midst of the report
 	  # (even though these links already exist at the top)
-	  $output =~ s,((?:ftp|http|https)://[\S~-]+?/?)([\)\'\:\.\,]?(?:\s|\.<|$)),<a href=\"$1\">$1</a>$2,go;
+	  $output =~ s,((?:ftp|http|https)://[\S~-]+?/?)((?:[\)\'\:\.\,]|\&\#39;)?(?:\s|\.<|$)),<a href=\"$1\">$1</a>$2,go;
 	  # Add links to the cloned bugs
 	  $output =~ s{(Bug )(\d+)( cloned as bugs? )(\d+)(?:\-(\d+)|)}{$1.bug_links(bug=>$2).$3.bug_links(bug=>(defined $5)?[$4..$5]:$4)}eo;
 	  # Add links to merged bugs
diff --git a/debian/changelog b/debian/changelog
index c3adfb7..44cf90b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -254,6 +254,7 @@ debbugs (2.4.2~exp0) experimental; urgency=low
   * Allow trailinng periods after the control stop commands (closes:
     #517834)
   * Ditch extra blank lines (closes: #494843)
+  * Handle &#39; ending links in Debbugs::CGI::Bugreport (closes: #539020)
 
   
  -- Don Armstrong <don@debian.org>  Sun, 26 Jul 2009 05:48:16 -0700