commit d330dd4e6ec63d95a513de2893b98284166e3923
parent fc24708642a785b37a74d568168b54f20d2e61cb
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Sun, 1 Nov 2009 17:56:18 -0500
Merge branch 'thread-joining-fix' into next
Conflicts:
lib/sup/xapian_index.rb
Diffstat:
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/sup/ferret_index.rb b/lib/sup/ferret_index.rb
@@ -127,8 +127,11 @@ EOS
:from => (m.from ? m.from.indexable_content : ""),
:to => (m.to + m.cc + m.bcc).map { |x| x.indexable_content }.join(" "),
+ ## always overwrite :refs.
+ ## these might have changed due to manual thread joining.
+ :refs => (m.refs + m.replytos).uniq.join(" "),
+
:subject => (entry[:subject] || wrap_subj(Message.normalize_subj(m.subj))),
- :refs => (entry[:refs] || (m.refs + m.replytos).uniq.join(" ")),
}
@index_mutex.synchronize do