[Bps-public-commit] RT-Extension-rt_cpan_org branch, master, updated. 07697aa9eec531b9f59b73525b9e24e2cd9afa5b

[Alex Vandiver]

The branch, master has been updated
       via  07697aa9eec531b9f59b73525b9e24e2cd9afa5b (commit)
      from  1c9cf220bace4bb19b143590c258e58ab0a874a0 (commit)

Summary of changes:
 patches/4.0.15-avoid-linking-punctuation.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 07697aa9eec531b9f59b73525b9e24e2cd9afa5b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Oct 2 00:08:40 2013 -0400

    Cherry-pick 778713a atop 2c8ed76 as well

diff --git a/patches/4.0.15-avoid-linking-punctuation.patch b/patches/4.0.15-avoid-linking-punctuation.patch
index 30d0111..3af234f 100644
--- a/patches/4.0.15-avoid-linking-punctuation.patch
+++ b/patches/4.0.15-avoid-linking-punctuation.patch
@@ -1,7 +1,7 @@
 From 2c8ed76665d5536df7d76bdb10a7f2dee92b8082 Mon Sep 17 00:00:00 2001
 From: Thomas Sibley <trs at bestpractical.com>
 Date: Mon, 22 Jul 2013 22:29:13 -0700
-Subject: [PATCH] Avoid linking trailing punctuation in MakeClicky
+Subject: [PATCH] Avoid linking trailing punctuation and HTML in MakeClicky
 
 ---
  share/html/Elements/MakeClicky | 4 ++--
@@ -16,13 +16,13 @@ index dabe3bb..854c93c 100644
      {
          name   => "httpurl",
 -        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#\S+)?/,
-+        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#\S+)?(?<![.?!,;:])/,
++        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#[^\s<]+)?(?<![.?!,;:])/,
          action => "url",
      },
      {
          name   => "httpurl_overwrite",
 -        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#\S+)?/,
-+        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#\S+)?(?<![.?!,;:])/,
++        regex  => qr/$RE{URI}{HTTP}{-keep}{-scheme => 'https?'}(?:#[^\s<]+)?(?<![.?!,;:])/,
          action => "url_overwrite",
      },
  );

-----------------------------------------------------------------------