Handle ' ending links in Debbugs::CGI::Bugreport (closes: #539020)

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index 57f8d8fe647838babaaf7859a284e64466b663a3..6986fbfccbd6ae3f25f59aae3e4432bdd576a928 100644 (file)
--- 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 c3adfb7a29d4eca79275a39c1739f104d75bfb73..44cf90bc3b510565f01e87246eb6265444c0e7e4 100644 (file)
--- 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 ' ending links in Debbugs::CGI::Bugreport (closes: #539020)
 
   
  -- Don Armstrong <don@debian.org>  Sun, 26 Jul 2009 05:48:16 -0700