wwwtext: show multiple infourl values properly

[public-inbox.git] / lib / PublicInbox / WwwText.pm

diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index bcda665c75b9572c029b86b9a829db09e27834fa..ace7f9d73231d0c22388f94f02c757ccd9d12d25 100644 (file)
--- 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 ($$) {
@@ -145,14 +143,17 @@ sub inbox_config ($$$) {
 ; see public-inbox-config(5) manpage for more details:
 ; https://public-inbox.org/public-inbox-config.html
 [publicinbox "$name"]
+       inboxdir = /path/to/top-level-inbox
+       ; note: public-inbox before v1.2.0 used "mainrepo"
+       ; instead of "inboxdir", both remain supported after 1.2
        mainrepo = /path/to/top-level-inbox
 EOS
-       for my $k (qw(address listid)) {
+       for my $k (qw(address listid infourl)) {
                defined(my $v = $ibx->{$k}) or next;
                $$txt .= "\t$k = $_\n" for @$v;
        }
 
-       for my $k (qw(filter infourl newsgroup obfuscate replyto watchheader)) {
+       for my $k (qw(filter newsgroup obfuscate replyto watchheader)) {
                defined(my $v = $ibx->{$k}) or next;
                $$txt .= "\t$k = $v\n";
        }