diff options
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/Linkify.pm | 17 | ||||
-rw-r--r-- | lib/PublicInbox/View.pm | 5 |
2 files changed, 9 insertions, 13 deletions
diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm index acd2a47e..8e1728c7 100644 --- a/lib/PublicInbox/Linkify.pm +++ b/lib/PublicInbox/Linkify.pm @@ -22,11 +22,10 @@ my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher):// (?:\#[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%\?]+)? )}xi; -sub new { bless {}, shift } +sub new { bless {}, $_[0] } sub linkify_1 { - my ($self, $s) = @_; - $s =~ s!$LINK_RE! + $_[1] =~ s!$LINK_RE! my $beg = $1 || ''; my $url = $2; my $end = ''; @@ -50,19 +49,17 @@ sub linkify_1 { # only escape ampersands, others do not match LINK_RE $url =~ s/&/&/g; - $self->{$key} = $url; + $_[0]->{$key} = $url; $beg . 'PI-LINK-'. $key . $end; !ge; - $s; + $_[1]; } sub linkify_2 { - my ($self, $s) = @_; - # Added "PI-LINK-" prefix to avoid false-positives on git commits - $s =~ s!\bPI-LINK-([a-f0-9]{40})\b! + $_[1] =~ s!\bPI-LINK-([a-f0-9]{40})\b! my $key = $1; - my $url = $self->{$key}; + my $url = $_[0]->{$key}; if (defined $url) { "<a\nhref=\"$url\">$url</a>"; } else { @@ -70,7 +67,7 @@ sub linkify_2 { $key; } !ge; - $s; + $_[1]; } 1; diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 39ca959c..e4e9d7d2 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -482,9 +482,8 @@ sub add_text_body { flush_quote(\$s, $l, \@quot) if @quot; # regular line, OK - $cur = $l->linkify_1($cur); - $cur = ascii_html($cur); - $s .= $l->linkify_2($cur); + $l->linkify_1($cur); + $s .= $l->linkify_2(ascii_html($cur)); } else { push @quot, $cur; } |