about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-12-25 07:50:56 +0000
committerEric Wong <e@80x24.org>2019-12-27 20:00:37 +0000
commitecd50473d81ae1ca7273e9f446139fa5a224b099 (patch)
tree8686439d419b170908a335f665046b5aca858692 /lib
parenta77caf8cd92fcc13d90f7e8b68da6e87008241f8 (diff)
downloadpublic-inbox-ecd50473d81ae1ca7273e9f446139fa5a224b099.tar.gz
We can pass arbitrary local variables via WWW $ctx, so
just pass that into the one-off _do_linkify sub which
already exists.
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/WwwText.pm20
1 files changed, 9 insertions, 11 deletions
diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index 1c7b92bd..2e4aeec0 100644
--- a/lib/PublicInbox/WwwText.pm
+++ b/lib/PublicInbox/WwwText.pm
@@ -53,27 +53,25 @@ sub get_text {
         # Follow git commit message conventions,
         # first line is the Subject/title
         my ($title) = ($txt =~ /\A([^\n]*)/s);
-        _do_linkify($txt);
+        $ctx->{txt} = \$txt;
         $ctx->{-title_html} = ascii_html($title);
-
         my $nslash = ($key =~ tr!/!/!);
         $ctx->{-upfx} = '../../../' . ('../' x $nslash);
-
-        PublicInbox::WwwStream->response($ctx, $code, sub {
-                my ($nr, undef) = @_;
-                $nr == 1 ? '<pre>'.$txt.'</pre>' : undef
-        });
+        PublicInbox::WwwStream->response($ctx, $code, \&_do_linkify);
 }
 
 sub _do_linkify {
+        my ($nr, $ctx) = @_;
+        return unless $nr == 1;
         my $l = PublicInbox::Linkify->new;
-        $l->linkify_1($_[0]);
+        my $txt = delete $ctx->{txt};
+        $l->linkify_1($$txt);
         if ($hl) {
-                $hl->do_hl_text(\($_[0]));
+                $hl->do_hl_text($txt);
         } else {
-                $_[0] = ascii_html($_[0]);
+                $$txt = ascii_html($$txt);
         }
-        $_[0] = $l->linkify_2($_[0]);
+        '<pre>' . $l->linkify_2($$txt) . '</pre>';
 }
 
 sub _srch_prefix ($$) {