From: Eric Wong <e@80x24.org>
Date: Sun, 8 Jan 2017 04:25:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/master' into repobrowse
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98a24a7404181006b2a102e9ae5e3a8938fdc172;p=thirdparty%2Fpublic-inbox.git

Merge remote-tracking branch 'origin/master' into repobrowse

* origin/master:
  inbox: properly register cleanup timer for git processes
  search: remove subject_summary
  searchmsg: favor direct hash access over accessor methods
  remove incorrect comment about strftime + locales
  config: allow per-inbox nntpserver
  inbox: eliminate weaken usage entirely
  inbox: describe the full key name
  config: remove unused get() method
  config: always use namespaced "publicinboxlimiter"
  qspawn: prepare to support runtime reloading of Limiter
  http: remove weaken usage, reduce anonsub capture scope
  httpd/async: remove weaken usage
  http: fix spelling error
  watch: watchspam affects all configured inboxes
  doc: minor updates to design notes
---

98a24a7404181006b2a102e9ae5e3a8938fdc172
diff --cc lib/PublicInbox/Inbox.pm
index 15db929e5,51ada0bc3..1a844e1cb
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@@ -226,9 -212,10 +212,10 @@@ sub msg_by_smsg ($$) 
  
  	# backwards compat to fallback to msg_by_mid
  	# TODO: remove if we bump SCHEMA_VERSION in Search.pm:
- 	defined(my $blob = $smsg->blob) or return msg_by_mid($self, $smsg->mid);
+ 	defined(my $blob = $smsg->{blob}) or
+ 			return msg_by_mid($self, $smsg->mid);
  
 -	my $str = git($self)->cat_file($blob, $ref);
 +	my $str = git($self)->cat_file($blob);
  	$$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
  	$str;
  }