about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--lib/PublicInbox/SearchThread.pm8
-rw-r--r--lib/PublicInbox/SearchView.pm2
-rw-r--r--lib/PublicInbox/View.pm3
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/PublicInbox/SearchThread.pm b/lib/PublicInbox/SearchThread.pm
index 931bd579..ab2f1a84 100644
--- a/lib/PublicInbox/SearchThread.pm
+++ b/lib/PublicInbox/SearchThread.pm
@@ -22,7 +22,7 @@ use strict;
 use warnings;
 
 sub thread {
-        my ($msgs, $ordersub, $ibx) = @_;
+        my ($msgs, $ordersub, $ctx) = @_;
         my $id_table = {};
 
         # Sadly, we sort here anyways since the fill-in-the-blanks References:
@@ -32,12 +32,13 @@ sub thread {
         # We'll trust the client Date: header here instead of the Received:
         # time since this is for display (and not retrieval)
         _add_message($id_table, $_) for sort { $a->{ds} <=> $b->{ds} } @$msgs;
+        my $ibx = $ctx->{-inbox};
         my $rootset = [ grep {
                         !delete($_->{parent}) && $_->visible($ibx)
                 } values %$id_table ];
         $id_table = undef;
         $rootset = $ordersub->($rootset);
-        $_->order_children($ordersub, $ibx) for @$rootset;
+        $_->order_children($ordersub, $ctx) for @$rootset;
         $rootset;
 }
 
@@ -151,10 +152,11 @@ sub visible ($$) {
 }
 
 sub order_children {
-        my ($cur, $ordersub, $ibx) = @_;
+        my ($cur, $ordersub, $ctx) = @_;
 
         my %seen = ($cur => 1); # self-referential loop prevention
         my @q = ($cur);
+        my $ibx = $ctx->{-inbox};
         while (defined($cur = shift @q)) {
                 my $c = $cur->{children}; # The hashref here...
 
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 78f2bd8b..566808e1 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -276,7 +276,7 @@ sub mset_thread {
         } ($mset->items) ]});
         my $r = $q->{r};
         my $rootset = PublicInbox::SearchThread::thread($msgs,
-                $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ds,
+                $r ? sort_relevance(\%pct) : \&PublicInbox::View::sort_ds,
                 $ctx);
         my $skel = search_nav_bot($mset, $q). "<pre>";
         $ctx->{-upfx} = '';
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 39b04174..33f71990 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -881,8 +881,7 @@ sub strict_loose_note ($) {
 sub thread_results {
         my ($ctx, $msgs) = @_;
         require PublicInbox::SearchThread;
-        my $ibx = $ctx->{-inbox};
-        my $rootset = PublicInbox::SearchThread::thread($msgs, *sort_ds, $ibx);
+        my $rootset = PublicInbox::SearchThread::thread($msgs, \&sort_ds, $ctx);
 
         # FIXME: `tid' is broken on --reindex, so that needs to be fixed
         # and preserved in the future.  This bug is hidden by `sid' matches