Merge remote-tracking branch 'origin/master' into repobrowse

* origin/master: (25 commits)
  evcleanup: ensure deferred close from timers are handled ASAP
  httpd/async: improve variable naming
  githttpbackend: minor cleanups to improve readability
  githttpbackend: simplify compatibility code
  githttpbackend: minor readability improvement
  http: fix clobbering of $null_io
  linkify: modify argument in place
  view: do not modify array during iteration
  view: stop chomping off whitespace at ends of messages
  view: remove unused parameter
  search: lookup_mail handles modified DBs
  doc: various comments on async handling
  searchthread: simplify API and remove needless OO
  searchthread: update comment about loop prevention
  searchmsg: remove ensure_metadata
  tests: add thread-all testing for benchmarking
  searchmsg: do not memoize {date} field
  searchmsg: remove locale-dependency for ->date
  t/config.t: fix feedmax default
  wwwtext: link to RFC4685 (Atom Threading)
  ...

1 files changed, 7 insertions, 10 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;