X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=e0810420809e3eb8fce5216eff08e47c83a53add;hb=81ea7f0100f016ad8c66605b49230e876a1eb82d;hp=f570a25da560ded94d9a247e1b9fb23208a01865;hpb=a80543303720bfe9c1293370ea2cafe98108a141;p=public-inbox.git

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index f570a25d..e0810420 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -1,10 +1,10 @@
-# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used for generating Atom feeds for web-accessible mailing list archives.
 package PublicInbox::Feed;
 use strict;
-use warnings;
+use v5.10.1;
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
 use PublicInbox::Smsg; # this loads w/o Search::Xapian
@@ -51,7 +51,10 @@ sub new_html_i {
 	my ($ctx, $eml) = @_;
 	$ctx->zmore($ctx->html_top) if exists $ctx->{-html_tip};
 
-	$eml and return PublicInbox::View::eml_entry($ctx, $eml);
+	if ($eml) {
+		$ctx->{smsg}->populate($eml) if !$ctx->{ibx}->{over};
+		return PublicInbox::View::eml_entry($ctx, $eml);
+	}
 	my $smsg = shift @{$ctx->{msgs}} or
 		$ctx->zmore(PublicInbox::View::pagination_footer(
 						$ctx, './new.html'));
@@ -108,13 +111,13 @@ sub recent_msgs {
 	my $last;
 	my $last_commit;
 	local $/ = "\n";
-	my @oids;
+	my @ret;
 	while (defined(my $line = <$log>)) {
 		if ($line =~ /$addmsg/o) {
 			my $add = $1;
 			next if $deleted{$add}; # optimization-only
-			push @oids, $add;
-			if (scalar(@oids) >= $max) {
+			push(@ret, bless { blob => $add }, 'PublicInbox::Smsg');
+			if (scalar(@ret) >= $max) {
 				$last = 1;
 				last;
 			}
@@ -136,8 +139,7 @@ sub recent_msgs {
 	$last_commit and
 		$ctx->{next_page} = qq[<a\nhref="?r=$last_commit"\nrel=next>] .
 					'next (older)</a>';
-
-	[ map { bless {blob => $_ }, 'PublicInbox::Smsg' } @oids ];
+	\@ret;
 }
 
 1;