From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, RP_MATCHES_RCVD shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: meta@public-inbox.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id E93881FA55 for ; Tue, 25 Aug 2015 09:42:06 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] feed: fix "created" vs "updated" diff in topics Date: Tue, 25 Aug 2015 09:42:06 +0000 Message-Id: <1440495726-31426-1-git-send-email-e@80x24.org> List-Id: This fixes a regression introduced in commit 72c0f7c71ff28de9755dc4aee8b6ce6f0e4f2ed7 (feed: merge subjects regardless of "[PATCH vN]") --- lib/PublicInbox/Feed.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index a0f901e..d34978c 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -345,7 +345,7 @@ sub add_topic { my $mid = $header_obj->header('Message-ID'); $mid = mid_compress(mid_clean($mid)); $u = $enc_utf8->decode($u); - push @$order, [ $mid, $ts, $u, $subj ]; + push @$order, [ $mid, $ts, $u, $subj, $topic ]; return 1; } 0; # old topic, continue going @@ -357,8 +357,8 @@ sub dump_topics { my $dst = ''; $dst .= "\n[No recent topics]" unless (scalar @$order); while (defined(my $info = shift @$order)) { - my ($mid, $ts, $u, $subj) = @$info; - my $n = delete $subjs->{$subj}; + my ($mid, $ts, $u, $subj, $topic) = @$info; + my $n = delete $subjs->{$topic}; $mid = PublicInbox::Hval->new($mid)->as_href; $subj = PublicInbox::Hval->new($subj)->as_html; $u = PublicInbox::Hval->new($u)->as_html; -- EW