X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=287b0a280575885f9c51678e80ed8b7ea277bc6d;hb=815f07f300a4f1e95a50cba76bbff449fa653325;hp=7e508bb7764238bfcc4958ecfcc131c08108f514;hpb=5d5789076ed4da7502ff18748d1553c899b78907;p=public-inbox.git

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 7e508bb7..287b0a28 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -7,7 +7,7 @@ use strict;
 use warnings;
 use URI::Escape qw(uri_unescape uri_escape);
 use PublicInbox::SearchMsg;
-use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
+use PublicInbox::Hval qw(ascii_html obfuscate_addrs mid_href);
 use PublicInbox::View;
 use PublicInbox::WwwAtomStream;
 use PublicInbox::SearchThread;
@@ -115,7 +115,7 @@ sub mset_summary {
 			obfuscate_addrs($obfs_ibx, $f);
 		}
 		my $date = PublicInbox::View::fmt_ts($smsg->{ds});
-		my $mid = PublicInbox::Hval->new_msgid($smsg->{mid})->{href};
+		my $mid = mid_href($smsg->{mid});
 		$s = '(no subject)' if $s eq '';
 		$$res .= qq{$rank. <b><a\nhref="$mid/">}.
 			$s . "</a></b>\n";
@@ -268,7 +268,8 @@ sub load_msgs {
 
 sub mset_thread {
 	my ($ctx, $mset, $q) = @_;
-	my $msgs = $ctx->{-inbox}->search->retry_reopen(\&load_msgs, $mset);
+	my $ibx = $ctx->{-inbox};
+	my $msgs = $ibx->search->retry_reopen(\&load_msgs, $mset);
 	my $r = $q->{r};
 	my $rootset = PublicInbox::SearchThread::thread($msgs,
 		$r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
@@ -285,7 +286,7 @@ sub mset_thread {
 	$ctx->{s_nr} = scalar(@$msgs).'+ results';
 
 	# reduce hash lookups in skel_dump
-	$ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
+	$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
 	PublicInbox::View::walk_thread($rootset, $ctx,
 		\&PublicInbox::View::pre_thread);
 
@@ -365,14 +366,10 @@ sub new {
 }
 
 sub qs_html {
-	my ($self, %over) = @_;
+	my ($self, %override) = @_;
 
-	if (keys %over) {
-		my $tmp = bless { %$self }, ref($self);
-		foreach my $k (keys %over) {
-			$tmp->{$k} = $over{$k};
-		}
-		$self = $tmp;
+	if (scalar(keys(%override))) {
+		$self = bless { (%$self, %override) }, ref($self);
 	}
 
 	my $q = uri_escape($self->{'q'}, MID_ESC);